[JBPM-10233] Using original list of nodes for dispatching

kiegroup · Jun 10, 2024 · 6f3170a · 6f3170a
1 parent 492f41a
commit 6f3170a
Showing 1 changed file with 6 additions and 3 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
@@ -694,6 +694,8 @@ public void signalEvent(String type, Object event) {
 
 
             try {
+                List<NodeInstance> currentView = getNodeInstances().stream().map(e -> (NodeInstance) e)
+                        .collect(Collectors.toList());
                 this.activatingNodeIds = new ArrayList<>();
                 List<EventListener> listeners = eventListeners.get(type);
                 if (listeners != null) {
@@ -708,7 +710,8 @@ public void signalEvent(String type, Object event) {
                     }
                 }
 
-                signal(this, (node) -> this.getNodeInstance(node), () -> this.getWorkflowProcess().getNodes(),  type, event);
+                signal(currentView, (node) -> this.getNodeInstance(node), () -> this.getWorkflowProcess().getNodes(),
+                        type, event);
 
                 if (((org.jbpm.workflow.core.WorkflowProcess) getWorkflowProcess()).isDynamic()) {
                     for (Node node : getWorkflowProcess().getNodes()) {
@@ -737,8 +740,8 @@ public void signalEvent(String type, Object event) {
         }
     }
 
-    private void signal(NodeInstanceContainer container, Function<Node,NodeInstance> nodeInstanceSupplier, Supplier<Node[]> resolveNodes, String type, Object event) {
-        List<NodeInstance> currentView = container.getNodeInstances().stream().map(e -> (NodeInstance) e).collect(Collectors.toList());
+    private void signal(List<NodeInstance> currentView, Function<Node, NodeInstance> nodeInstanceSupplier,
+            Supplier<Node[]> resolveNodes, String type, Object event) {
         for (Node node : resolveNodes.get()) {
             if (node instanceof EventNodeInterface
                     && ((EventNodeInterface) node).acceptsEvent(type, event, getEventFilterResolver(this, node, currentView))) {