From 7349de9abad8dac5936c7d824b5682b7b20e5291 Mon Sep 17 00:00:00 2001 From: jbarrez Date: Wed, 2 Mar 2011 17:21:37 +0000 Subject: [PATCH] ACT-688: bugfix: mail task doesnt leave activity --- .../engine/impl/bpmn/behavior/MailActivityBehavior.java | 3 ++- .../activiti/engine/test/bpmn/mail/EmailServiceTaskTest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/MailActivityBehavior.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/MailActivityBehavior.java index 3665dcfd4d..b60ddb942c 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/MailActivityBehavior.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/MailActivityBehavior.java @@ -29,7 +29,7 @@ import org.apache.commons.mail.SimpleEmail; * @author Joram Barrez * @author Frederik Heremans */ -public class MailActivityBehavior implements ActivityBehavior { +public class MailActivityBehavior extends FlowNodeActivityBehavior { private Expression to; private Expression from; @@ -62,6 +62,7 @@ public class MailActivityBehavior implements ActivityBehavior { } catch (EmailException e) { throw new ActivitiException("Could not send e-mail", e); } + leave(execution); } protected Email createEmail(String text, String html) { diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.java index 147ace896d..83ea43e65e 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.java @@ -56,7 +56,7 @@ public class EmailServiceTaskTest extends PluggableActivitiTestCase { @Deployment public void testSimpleTextMail() throws Exception { - runtimeService.startProcessInstanceByKey("simpleTextOnly"); + String procId = runtimeService.startProcessInstanceByKey("simpleTextOnly").getId(); List messages = wiser.getMessages(); assertEquals(1, messages.size()); @@ -64,6 +64,7 @@ public class EmailServiceTaskTest extends PluggableActivitiTestCase { WiserMessage message = messages.get(0); assertEmailSend(message, false, "Hello Kermit!", "This a text only e-mail.", "activiti@localhost", Arrays.asList("kermit@activiti.org"), null); + assertProcessEnded(procId); } @Deployment -- GitLab