Try changing order of listeners

apache · Nov 14, 2024 · d852da7 · d852da7
1 parent dfd99df
commit d852da7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.../jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java b/.../jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java
@@ -442,8 +442,6 @@ public void setState(final int state, String outcome) {
 
             removeEventListeners();
             processRuntime.getProcessInstanceManager().removeProcessInstance(this);
-            processRuntime.getProcessEventSupport().fireAfterProcessCompleted(this, kruntime);
-
             if (isSignalCompletion()) {
 
                 List<KogitoEventListener> listeners = eventListeners.get("processInstanceCompleted:" + getStringId());
@@ -455,6 +453,8 @@ public void setState(final int state, String outcome) {
 
                 processRuntime.getSignalManager().signalEvent("processInstanceCompleted:" + getStringId(), this);
             }
+            processRuntime.getProcessEventSupport().fireAfterProcessCompleted(this, kruntime);
+
         } else {
             super.setState(state, outcome);
         }

diff --git a/jbpm/jbpm-flow/src/main/java/org/kie/kogito/process/impl/AbstractProcessInstance.java b/jbpm/jbpm-flow/src/main/java/org/kie/kogito/process/impl/AbstractProcessInstance.java
@@ -85,7 +85,7 @@ public abstract class AbstractProcessInstance<T extends Model> implements Proces
     protected final T variables;
     protected final AbstractProcess<T> process;
     protected InternalProcessRuntime rt;
-    protected volatile WorkflowProcessInstance processInstance;
+    protected WorkflowProcessInstance processInstance;
 
     protected Integer status;
 
@@ -334,7 +334,7 @@ public T variables() {
 
     @Override
     public int status() {
-        return processInstance != null ? processInstance.getState() : status;
+        return status;
     }
 
     @Override