finalize act-1589

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)  // Do not continue if process has alread finished
+       leave(execution);        
   }
  
 }

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/signal/SignalEventTest.java

@@ -376,13 +376,10 @@ public class SignalEventTest extends PluggableActivitiTestCase {
   }
   
   @Deployment 
-  public void testEarlyFinishedProcess() {
-	 	Map<String, Object> variableMap = new HashMap<String, Object>();
-		variableMap.put("name", "Activiti");
+  public void testEarlyFinishedProcess() {	 	
 		ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(
-				"callerProcess", variableMap);
+				"callerProcess");
 		assertNotNull(processInstance.getId());
-	
 		
   }
 

modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/signal/SignalEventTests.earlyFinishedProcess.bpmn20.xml → 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>