Fix NPE when having two sentries, and one doesn't have an ifPart

Author: jbarrez

modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/agenda/operation/AbstractEvaluationCriteriaOperation.java

@@ -517,6 +517,7 @@ protected Criterion evaluateCriteria(EntityWithSentryPartInstances entityWithSen
                         satisfiedSentryOnPartIds.add(sentryPartInstanceEntity.getOnPartId());
 
                     } else if (sentryPartInstanceEntity.getIfPartId() != null
+                        && sentry.getSentryIfPart() != null
                         && sentryPartInstanceEntity.getIfPartId().equals(sentry.getSentryIfPart().getId())) {
 
                         sentryIfPartSatisfied = true;

modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/runtime/EntryCriteriaTest.java

@@ -395,4 +395,48 @@ public void testRepeatingCrossBoundary3() {
 
     }
 
+    @Test
+    @CmmnDeployment
+    public void testMultipleEntryCriteriaWithAndWithoutIfPart() {
+
+        // A plan item (Stage C) has two entry criteria:
+        // - sentry1: two onParts (A complete + B complete), no ifPart
+        // - sentry2: one onPart (B complete) + ifPart (myVar == true), default trigger mode (event deferred)
+        //
+        // The ifPart of sentry2 is evaluated proactively and stored as a
+        // SentryPartInstanceEntity. When later evaluating sentry1 (which has no ifPart), the code iterates
+        // through all satisfied sentry part instances for the plan item and must not NPE on the ifPart
+        // instance from sentry2.
+
+        CaseInstance caseInstance = cmmnRuntimeService.createCaseInstanceBuilder()
+                .caseDefinitionKey("myCase")
+                .variable("myVar", true)
+                .start();
+
+        List<Task> tasks = cmmnTaskService.createTaskQuery().caseInstanceId(caseInstance.getId()).orderByTaskName().asc().list();
+        assertThat(tasks)
+                .extracting(Task::getName)
+                .containsExactly("A", "B");
+
+        // Completing A triggers evaluation of sentry1 (no ifPart) while a satisfied ifPart instance
+        // from sentry2 exists. Before the fix, this caused a NullPointerException.
+        cmmnTaskService.complete(tasks.get(0).getId());
+
+        PlanItemInstance stageCInstance = cmmnRuntimeService.createPlanItemInstanceQuery()
+                .planItemInstanceName("Stage C").singleResult();
+        assertThat(stageCInstance.getState()).isEqualTo(PlanItemInstanceState.AVAILABLE);
+
+        // Completing B satisfies both sentries, activating Stage C
+        Task taskB = cmmnTaskService.createTaskQuery().caseInstanceId(caseInstance.getId()).singleResult();
+        assertThat(taskB.getName()).isEqualTo("B");
+        cmmnTaskService.complete(taskB.getId());
+
+        stageCInstance = cmmnRuntimeService.createPlanItemInstanceQuery()
+                .planItemInstanceName("Stage C").singleResult();
+        assertThat(stageCInstance.getState()).isEqualTo(PlanItemInstanceState.ACTIVE);
+
+        Task taskC = cmmnTaskService.createTaskQuery().caseInstanceId(caseInstance.getId()).singleResult();
+        assertThat(taskC.getName()).isEqualTo("C");
+    }
+
 }

modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/runtime/EntryCriteriaTest.testMultipleEntryCriteriaWithAndWithoutIfPart.cmmn

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:flowable="http://flowable.org/cmmn"
+             xmlns:cmmndi="http://www.omg.org/spec/CMMN/20151109/CMMNDI" xmlns:dc="http://www.omg.org/spec/CMMN/20151109/DC"
+             xmlns:di="http://www.omg.org/spec/CMMN/20151109/DI" targetNamespace="http://www.flowable.org/casedef">
+    <case id="myCase">
+        <casePlanModel id="myPlanModel" name="My CasePlanModel">
+
+            <planItem id="planItem1" name="A" definitionRef="taskA"/>
+            <planItem id="planItem2" name="B" definitionRef="taskB"/>
+            <planItem id="planItem3" name="Stage C" definitionRef="stageC">
+                <entryCriterion id="entry1" sentryRef="sentry1"/>
+                <entryCriterion id="entry2" sentryRef="sentry2"/>
+            </planItem>
+
+            <!-- Sentry with 2 onParts, NO ifPart -->
+            <sentry id="sentry1">
+                <planItemOnPart id="onPart1" sourceRef="planItem1">
+                    <standardEvent>complete</standardEvent>
+                </planItemOnPart>
+                <planItemOnPart id="onPart2" sourceRef="planItem2">
+                    <standardEvent>complete</standardEvent>
+                </planItemOnPart>
+            </sentry>
+
+            <!-- Sentry with 1 onPart + ifPart event deferred -->
+            <sentry id="sentry2">
+                <planItemOnPart id="onPart3" sourceRef="planItem2">
+                    <standardEvent>complete</standardEvent>
+                </planItemOnPart>
+                <ifPart>
+                    <condition><![CDATA[${myVar}]]></condition>
+                </ifPart>
+            </sentry>
+
+            <humanTask id="taskA" name="A"/>
+            <humanTask id="taskB" name="B"/>
+            <stage id="stageC" name="Stage C">
+                <planItem id="planItem4" name="C" definitionRef="taskC"/>
+                <humanTask id="taskC" name="C"/>
+            </stage>
+
+        </casePlanModel>
+    </case>
+</definitions>