Execute normal action post function before split/join action

tedliang · Sep 10, 2016 · 040f84d · 040f84d
1 parent 6427994
commit 040f84d
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 29 deletions.
diff --git a/build.xml b/build.xml
@@ -1,5 +1,6 @@
 <project name="workflow" default="jar" basedir=".">
 
+  <property name="compile.version" value="1.5"/>
   <property name="test.compile.version" value="1.5"/>
   <property name="src.test" location="src/test"/>
   <property name="common.build" value="osbuild.xml"/>

diff --git a/src/java/com/opensymphony/workflow/AbstractWorkflow.java b/src/java/com/opensymphony/workflow/AbstractWorkflow.java
@@ -1292,8 +1292,40 @@ protected boolean transitionWorkflow(WorkflowEntry entry, List currentSteps, Wor
             }
         }
 
+        ActionType actionType = ActionType.resolveByResultDescriptor(theResults[0]);
+
         // go to next step
-        if (theResults[0].getSplit() != 0) {
+        if (actionType == ActionType.NEXT) {
+            // normal finish, no splits or joins
+            long[] previousIds = null;
+
+            if (step != null) {
+                previousIds = new long[] {step.getId()};
+            }
+
+            if (!action.isFinish()) {
+                createNewCurrentStep(theResults[0], entry, store, action.getId(), step, previousIds, transientVars, ps);
+            }
+        }
+
+        // postFunctions (BOTH)
+        if (extraPostFunctions != null) {
+            for (Iterator iterator = extraPostFunctions.iterator();
+                 iterator.hasNext();) {
+                FunctionDescriptor function = (FunctionDescriptor) iterator.next();
+                executeFunction(function, transientVars, ps);
+            }
+        }
+
+        List postFunctions = action.getPostFunctions();
+
+        for (Iterator iterator = postFunctions.iterator(); iterator.hasNext();) {
+            FunctionDescriptor function = (FunctionDescriptor) iterator.next();
+            executeFunction(function, transientVars, ps);
+        }
+
+
+        if (actionType == ActionType.SPLIT) {
             // the result is a split request, handle it correctly
             SplitDescriptor splitDesc = wf.getSplit(theResults[0].getSplit());
             Collection results = splitDesc.getResults();
@@ -1397,7 +1429,7 @@ protected boolean transitionWorkflow(WorkflowEntry entry, List currentSteps, Wor
                 FunctionDescriptor function = (FunctionDescriptor) iterator.next();
                 executeFunction(function, transientVars, ps);
             }
-        } else if (theResults[0].getJoin() != 0) {
+        } else if (actionType == ActionType.JOIN) {
             // this is a join, finish this step...
             JoinDescriptor joinDesc = wf.getJoin(theResults[0].getJoin());
             step = store.markFinished(step, action.getId(), new Date(), theResults[0].getOldStatus(), context.getCaller());
@@ -1492,33 +1524,6 @@ protected boolean transitionWorkflow(WorkflowEntry entry, List currentSteps, Wor
                     executeFunction(function, transientVars, ps);
                 }
             }
-        } else {
-            // normal finish, no splits or joins
-            long[] previousIds = null;
-
-            if (step != null) {
-                previousIds = new long[] {step.getId()};
-            }
-
-            if (!action.isFinish()) {
-                createNewCurrentStep(theResults[0], entry, store, action.getId(), step, previousIds, transientVars, ps);
-            }
-        }
-
-        // postFunctions (BOTH)
-        if (extraPostFunctions != null) {
-            for (Iterator iterator = extraPostFunctions.iterator();
-                    iterator.hasNext();) {
-                FunctionDescriptor function = (FunctionDescriptor) iterator.next();
-                executeFunction(function, transientVars, ps);
-            }
-        }
-
-        List postFunctions = action.getPostFunctions();
-
-        for (Iterator iterator = postFunctions.iterator(); iterator.hasNext();) {
-            FunctionDescriptor function = (FunctionDescriptor) iterator.next();
-            executeFunction(function, transientVars, ps);
         }
 
         //if executed action was an initial action then workflow is activated

diff --git a/src/java/com/opensymphony/workflow/ActionType.java b/src/java/com/opensymphony/workflow/ActionType.java
@@ -0,0 +1,17 @@
+package com.opensymphony.workflow;
+
+import com.opensymphony.workflow.loader.ResultDescriptor;
+
+public enum ActionType {
+    NEXT, SPLIT, JOIN;
+
+    public static ActionType resolveByResultDescriptor(ResultDescriptor result) {
+        if (result.getSplit() != 0) {
+            return SPLIT;
+        }
+        if (result.getJoin() != 0) {
+            return JOIN;
+        }
+        return NEXT;
+    }
+}