Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix NPE during PI modification #10601

Merged
merged 2 commits into from
Oct 5, 2022
Merged

Fix NPE during PI modification #10601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5df6a7d
test(engine): verify termination of multi instance body and nested el…
remcowesterhoud Oct 4, 2022
43b0a1d
fix(engine): prevent NPE during termination
remcowesterhoud Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...camunda/zeebe/engine/processing/processinstance/ProcessInstanceModificationProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,12 @@ public void processRecord(
instruction -> {
final var elementInstance =
elementInstanceState.getInstance(instruction.getElementInstanceKey());
if (elementInstance == null) {
// at this point this element instance has already been terminated as a result of
// one of the previous terminate instructions. As a result we no longer need to
// terminate it.
return;
}
final var flowScopeKey = elementInstance.getValue().getFlowScopeKey();

terminateElement(elementInstance, sideEffectQueue);
Expand Down
88 changes: 88 additions & 0 deletions ...camunda/zeebe/engine/processing/processinstance/ModifyProcessInstanceTerminationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,6 +973,94 @@ public void shouldTerminateSequentialMultiInstanceElement() {
tuple(BpmnElementType.PROCESS, ProcessInstanceIntent.ELEMENT_TERMINATED));
}

@Test
public void shouldTerminateMultiInstanceBodyAndNestedElements() {
// given
ENGINE
.deployment()
.withXmlResource(
Bpmn.createExecutableProcess(PROCESS_ID)
.startEvent()
.subProcess(
"A",
s ->
s.embeddedSubProcess()
.startEvent()
.userTask("B")
.endEvent()
.subProcessDone()
.multiInstance()
.parallel()
.zeebeInputCollectionExpression("[1,2,3]")
.multiInstanceDone())
.endEvent()
.done())
.deploy();
final var processInstanceKey = ENGINE.processInstance().ofBpmnProcessId(PROCESS_ID).create();

final var multiInstanceElement =
RecordingExporter.processInstanceRecords(ProcessInstanceIntent.ELEMENT_ACTIVATED)
.withProcessInstanceKey(processInstanceKey)
.withElementId("A")
.withElementType(BpmnElementType.MULTI_INSTANCE_BODY)
.getFirst();
Assertions.assertThat(
RecordingExporter.processInstanceRecords(ProcessInstanceIntent.ELEMENT_ACTIVATED)
.withProcessInstanceKey(processInstanceKey)
.withElementId("B")
.withElementType(BpmnElementType.USER_TASK)
.limit(3))
.describedAs("Expect that all 3 user tasks are activated")
.hasSize(3);
final var elements =
RecordingExporter.processInstanceRecords(ProcessInstanceIntent.ELEMENT_ACTIVATED)
.withProcessInstanceKey(processInstanceKey)
.withElementType(BpmnElementType.SUB_PROCESS)
.limit(3)
.map(Record::getKey)
.toList();

// when
ENGINE
.processInstance()
.withInstanceKey(processInstanceKey)
.modification()
.terminateElement(multiInstanceElement.getKey())
.terminateElement(elements.get(0))
.terminateElement(elements.get(1))
.terminateElement(elements.get(2))
.modify();

// then
assertThatElementIsTerminated(processInstanceKey, "A");

Assertions.assertThat(
RecordingExporter.processInstanceRecords()
.onlyEvents()
.withProcessInstanceKey(processInstanceKey)
.skipUntil(r -> r.getIntent() == ProcessInstanceIntent.ELEMENT_TERMINATING)
.limitToProcessInstanceTerminated())
.extracting(r -> r.getValue().getBpmnElementType(), Record::getIntent)
.describedAs("Expect that all active instances of the multi-instance have been terminated")
.containsSequence(
tuple(BpmnElementType.MULTI_INSTANCE_BODY, ProcessInstanceIntent.ELEMENT_TERMINATING),
tuple(BpmnElementType.SUB_PROCESS, ProcessInstanceIntent.ELEMENT_TERMINATING),
tuple(BpmnElementType.USER_TASK, ProcessInstanceIntent.ELEMENT_TERMINATING),
tuple(BpmnElementType.USER_TASK, ProcessInstanceIntent.ELEMENT_TERMINATED),
tuple(BpmnElementType.SUB_PROCESS, ProcessInstanceIntent.ELEMENT_TERMINATED),
tuple(BpmnElementType.SUB_PROCESS, ProcessInstanceIntent.ELEMENT_TERMINATING),
tuple(BpmnElementType.USER_TASK, ProcessInstanceIntent.ELEMENT_TERMINATING),
tuple(BpmnElementType.USER_TASK, ProcessInstanceIntent.ELEMENT_TERMINATED),
tuple(BpmnElementType.SUB_PROCESS, ProcessInstanceIntent.ELEMENT_TERMINATED),
tuple(BpmnElementType.SUB_PROCESS, ProcessInstanceIntent.ELEMENT_TERMINATING),
tuple(BpmnElementType.USER_TASK, ProcessInstanceIntent.ELEMENT_TERMINATING),
tuple(BpmnElementType.USER_TASK, ProcessInstanceIntent.ELEMENT_TERMINATED),
tuple(BpmnElementType.SUB_PROCESS, ProcessInstanceIntent.ELEMENT_TERMINATED),
tuple(BpmnElementType.MULTI_INSTANCE_BODY, ProcessInstanceIntent.ELEMENT_TERMINATED),
tuple(BpmnElementType.PROCESS, ProcessInstanceIntent.ELEMENT_TERMINATING),
tuple(BpmnElementType.PROCESS, ProcessInstanceIntent.ELEMENT_TERMINATED));
}

private static long getElementInstanceKeyOfElement(
final long processInstanceKey, final String elementId) {
return RecordingExporter.processInstanceRecords(ProcessInstanceIntent.ELEMENT_ACTIVATED)
Expand Down