8:10 a.m.
Author: rebody
Date: 2010-05-21 02:10:39 -0400 (Fri, 21 May 2010)
New Revision: 6367
Added:
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/forkjoin/ForkResultsInNullEndActivityTest.java
Modified:
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EndActivity.java
Log:
JBPM-2833 when we end a child execution of processInstance, the history process instance
didn't record end activity.
Modified:
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EndActivity.java
===================================================================
---
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EndActivity.java 2010-05-21
06:03:10 UTC (rev 6366)
+++
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EndActivity.java 2010-05-21
06:10:39 UTC (rev 6367)
@@ -37,29 +37,29 @@
public class EndActivity extends JpdlActivity {
private static final long serialVersionUID = 1L;
-
+
protected boolean endProcessInstance = true;
protected String state = null;
public void execute(ActivityExecution execution) {
execute((ExecutionImpl)execution);
}
-
+
public void execute(ExecutionImpl execution) {
Activity activity = execution.getActivity();
List<Transition> outgoingTransitions = activity.getOutgoingTransitions();
ActivityImpl parentActivity = (ActivityImpl) activity.getParentActivity();
if ( (parentActivity!=null)
- && ("group".equals(parentActivity.getType()))
+ && ("group".equals(parentActivity.getType()))
) {
- // if the end activity itself has an outgoing transition
+ // if the end activity itself has an outgoing transition
// (such end activities should be drawn on the border of the group)
if ( (outgoingTransitions!=null)
&& (outgoingTransitions.size()==1)
) {
Transition outgoingTransition = outgoingTransitions.get(0);
- // taking the transition that goes over the group boundaries will
+ // taking the transition that goes over the group boundaries will
// destroy the scope automatically (see atomic operation TakeTransition)
execution.take(outgoingTransition);
@@ -67,15 +67,16 @@
execution.setActivity(parentActivity);
execution.signal();
}
-
+
} else {
ExecutionImpl executionToEnd = null;
if (endProcessInstance) {
executionToEnd = execution.getProcessInstance();
+ executionToEnd.setActivity(execution.getActivity());
} else {
executionToEnd = execution;
}
-
+
if (state==null) {
executionToEnd.end();
} else {
@@ -83,7 +84,7 @@
}
}
}
-
+
public void setEndProcessInstance(boolean endProcessInstance) {
this.endProcessInstance = endProcessInstance;
}
Added:
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/forkjoin/ForkResultsInNullEndActivityTest.java
===================================================================
---
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/forkjoin/ForkResultsInNullEndActivityTest.java
(rev 0)
+++
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/forkjoin/ForkResultsInNullEndActivityTest.java 2010-05-21
06:10:39 UTC (rev 6367)
@@ -0,0 +1,118 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+ package org.jbpm.test.activity.forktest;
+
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.pvm.internal.model.ExecutionImpl;
+import org.jbpm.test.JbpmTestCase;
+
+import java.util.Set;
+
+public class ForkResultsInNullEndActivityTest extends JbpmTestCase {
+ private String deploymentId;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ final String jpdl = "<?xml version=\"1.0\"
encoding=\"UTF-8\"?>\n" +
+ "<process name=\"ForkTest\"
xmlns=\"http://jbpm.org/4.3/jpdl\">\n" +
+ " <start name=\"preparing test\">\n" +
+ " <transition to=\"fork\"/>\n" +
+ " </start>\n" +
+ " <fork name=\"fork\">\n" +
+ " <transition to=\"state1\"/>\n" +
+ " <transition to=\"state2\"/>\n" +
+ " <transition to=\"cancel\"/>\n" +
+ " </fork>\n" +
+ " <state name=\"cancel\">\n" +
+ " <transition to=\"cancelled\"/>\n" +
+ " </state>\n" +
+ " <state name=\"state1\">\n" +
+ " <transition to=\"states
completed\"/>\n" +
+ " </state>\n" +
+ " <state name=\"state2\">\n" +
+ " <transition to=\"states
completed\"/>\n" +
+ " </state>\n" +
+ " <join multiplicity=\"2\" name=\"states
completed\">\n" +
+ " <transition to=\"completed\"/>\n" +
+ " </join>\n" +
+ " <end name=\"cancelled\"/>\n" +
+ " <end name=\"completed\"/>\n" +
+ "</process>";
+
+ // Deploys the process
+ deploymentId = repositoryService.createDeployment().
+ addResourceFromString("ForkTest.jpdl.xml", jpdl).deploy();
+ }
+
+ protected void tearDown() throws Exception {
+ repositoryService.deleteDeploymentCascade(deploymentId);
+ super.tearDown();
+ }
+
+ private void verifyInitialActivities(ProcessInstance proc) {
+ String[] expectedStartActivities = {"state1", "state2",
"cancel"};
+ Set<String> foundStartActivities = proc.findActiveActivityNames();
+ for (String act : expectedStartActivities) {
+ assertTrue(foundStartActivities.contains(act));
+ }
+ }
+
+ public void testCompleteJoin() {
+ ProcessInstance proc =
executionService.startProcessInstanceByKey("ForkTest");
+ verifyInitialActivities(proc);
+
+ String state1Id = proc.findActiveExecutionIn("state1").getId();
+ proc = executionService.signalExecutionById(state1Id);
+
+ String state2Id = proc.findActiveExecutionIn("state2").getId();
+ proc = executionService.signalExecutionById(state2Id);
+
+ assertExecutionEnded(proc.getId());
+
+ //the name of the end activity should now be set on the execution
+ ExecutionImpl executionImpl = (ExecutionImpl) proc;
+ assertEquals("completed", executionImpl.getActivityName());
+
+ assertEquals("completed",
historyService.createHistoryProcessInstanceQuery()
+ .uniqueResult()
+ .getEndActivityName());
+ }
+
+ public void testCancelWithoutJoin() {
+ ProcessInstance proc =
executionService.startProcessInstanceByKey("ForkTest");
+ verifyInitialActivities(proc);
+
+ String driveTruckExecutionId =
proc.findActiveExecutionIn("cancel").getId();
+ proc = executionService.signalExecutionById(driveTruckExecutionId);
+
+ assertExecutionEnded(proc.getId());
+
+ //the name of the end activity should now be set on the execution
+ ExecutionImpl executionImpl = (ExecutionImpl) proc;
+ assertEquals("cancelled", executionImpl.getActivityName());
+
+ assertEquals("cancelled",
historyService.createHistoryProcessInstanceQuery()
+ .uniqueResult()
+ .getEndActivityName());
+ }
+
+}