From 0bbeec0c849d2e1285302472a38d7090d7f3d1f2 Mon Sep 17 00:00:00 2001
From: Saeid Mirzaei <saeid.mirzaei@atos.net>
Date: Fri, 20 Dec 2013 12:35:19 +0100
Subject: [PATCH] fix ACT-1589

---
 .../IntermediateThrowSignalEventActivityBehavior.java         | 4 ++--
 ...ml => SignalEventTest.testEarlyFinishedProcess.bpmn20.xml} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/signal/{SignalEventTests.earlyFinishedProcess.bpmn20.xml => SignalEventTest.testEarlyFinishedProcess.bpmn20.xml} (96%)

diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/IntermediateThrowSignalEventActivityBehavior.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/IntermediateThrowSignalEventActivityBehavior.java
index 4d448b563c..d0e96d51a4 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/IntermediateThrowSignalEventActivityBehavior.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/IntermediateThrowSignalEventActivityBehavior.java
@@ -57,8 +57,8 @@ public class IntermediateThrowSignalEventActivityBehavior extends AbstractBpmnAc
     for (SignalEventSubscriptionEntity signalEventSubscriptionEntity : subscriptionEntities) {
       signalEventSubscriptionEntity.eventReceived(null, signalDefinition.isAsync());
     }
-    if (execution.getActivity() != null)
-    leave(execution);        
+    if (execution.getActivity() != null)  // dont continue if process has already finished
+       leave(execution);
   }
  
 }
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/signal/SignalEventTests.earlyFinishedProcess.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/signal/SignalEventTest.testEarlyFinishedProcess.bpmn20.xml
similarity index 96%
rename from modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/signal/SignalEventTests.earlyFinishedProcess.bpmn20.xml
rename to modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/signal/SignalEventTest.testEarlyFinishedProcess.bpmn20.xml
index f20a733bf3..3994314e36 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/signal/SignalEventTests.earlyFinishedProcess.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/signal/SignalEventTest.testEarlyFinishedProcess.bpmn20.xml
@@ -25,7 +25,7 @@
     <startEvent id="startevent2" name="Start"></startEvent>
     <endEvent id="endevent2" name="End"></endEvent>
     <intermediateThrowEvent id="signalintermediatethrowevent1" name="SignalThrowEvent">
-      <signalEventDefinition signalRef="signal1"></signalEventDefinition>
+      <signalEventDefinition signalRef="killSignal"></signalEventDefinition>
     </intermediateThrowEvent>
     <sequenceFlow id="flow6" sourceRef="startevent2" targetRef="signalintermediatethrowevent1"></sequenceFlow>
     <userTask id="usertask1" name="User Task" activiti:candidateGroups="group1"></userTask>
-- 
GitLab