Skip to content

Commit c551b47

Browse files
authored
Fix NPE before creating entity links during dynamic state management
This this aligns the call to `EntityLinkUtil#createEntityLinks` with the other places by first checking if entity links are even enabled
1 parent bb087aa commit c551b47

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

modules/flowable-engine/src/main/java/org/flowable/engine/impl/dynamic/AbstractDynamicStateManager.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,8 +1101,10 @@ protected ExecutionEntity createCallActivityInstance(CallActivity callActivity,
11011101
}
11021102

11031103
ExecutionEntity subProcessInstance = executionEntityManager.createSubprocessInstance(subProcessDefinition, parentExecution, businessKey, initialActivityId);
1104-
EntityLinkUtil.createEntityLinks(parentExecution.getProcessInstanceId(), parentExecution.getId(), callActivity.getId(),
1105-
subProcessInstance.getId(), ScopeTypes.BPMN);
1104+
if (processEngineConfiguration.isEnableEntityLinks()) {
1105+
EntityLinkUtil.createEntityLinks(parentExecution.getProcessInstanceId(), parentExecution.getId(), callActivity.getId(),
1106+
subProcessInstance.getId(), ScopeTypes.BPMN);
1107+
}
11061108
CommandContextUtil.getActivityInstanceEntityManager(commandContext).recordSubProcessInstanceStart(parentExecution, subProcessInstance);
11071109

11081110
FlowableEventDispatcher eventDispatcher = processEngineConfiguration.getEventDispatcher();

0 commit comments

Comments
 (0)