From 92f1aabd2d2bd83ada057d9a991b194d253d5d14 Mon Sep 17 00:00:00 2001 From: Robert Gurol Date: Fri, 4 Oct 2024 10:14:34 +0200 Subject: [PATCH] fix a signal creation bug fix a bug where for the second process you start, signal processing would happen differently (e.g. scope would always be null) --- .../engine/impl/dynamic/AbstractDynamicStateManager.java | 3 --- .../org/flowable/engine/impl/util/ProcessInstanceHelper.java | 3 --- 2 files changed, 6 deletions(-) diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/dynamic/AbstractDynamicStateManager.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/dynamic/AbstractDynamicStateManager.java index 1002867bf72..7e370805a70 100644 --- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/dynamic/AbstractDynamicStateManager.java +++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/dynamic/AbstractDynamicStateManager.java @@ -1549,9 +1549,6 @@ protected void processCreatedEventSubProcess(EventSubProcess eventSubProcess, Ex SignalEventDefinition signalEventDefinition = (SignalEventDefinition) eventDefinition; BpmnModel bpmnModel = ProcessDefinitionUtil.getBpmnModel(eventSubProcessExecution.getProcessDefinitionId()); Signal signal = bpmnModel.getSignal(signalEventDefinition.getSignalRef()); - if (signal != null) { - signalEventDefinition.setSignalRef(signal.getName()); - } ExecutionEntity signalExecution = processEngineConfiguration.getExecutionEntityManager().createChildExecution(eventSubProcessExecution.getParent()); signalExecution.setCurrentFlowElement(startEvent); diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/util/ProcessInstanceHelper.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/util/ProcessInstanceHelper.java index d50533f862a..92f39668b07 100644 --- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/util/ProcessInstanceHelper.java +++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/util/ProcessInstanceHelper.java @@ -453,9 +453,6 @@ protected void handleSignalEventSubscription(EventDefinition eventDefinition, St SignalEventDefinition signalEventDefinition = (SignalEventDefinition) eventDefinition; BpmnModel bpmnModel = ProcessDefinitionUtil.getBpmnModel(parentExecution.getProcessDefinitionId()); Signal signal = bpmnModel.getSignal(signalEventDefinition.getSignalRef()); - if (signal != null) { - signalEventDefinition.setSignalRef(signal.getName()); - } ExecutionEntity signalExecution = processEngineConfiguration.getExecutionEntityManager().createChildExecution(parentExecution); signalExecution.setCurrentFlowElement(startEvent);