From 9f7388314c85a6d67ef66976e13c135e88582d19 Mon Sep 17 00:00:00 2001
From: youwenling <youwenling@nistone.com>
Date: Tue, 10 Sep 2024 10:45:49 +0800
Subject: [PATCH 1/2] fixed throwing an exception when process contains two
 boundary events and the first is compensation

---
 .../impl/agenda/ContinueProcessOperation.java |  6 ++++
 .../event/compensate/CompensateEventTest.java | 19 ++++++++----
 ...daryEventAndFirstIsCompensation.bpmn20.xml | 29 +++++++++++++++++++
 3 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 modules/flowable-engine/src/test/resources/org/flowable/engine/test/bpmn/event/compensate/CompensateEventTest.testTwoBoundaryEventAndFirstIsCompensation.bpmn20.xml

diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/agenda/ContinueProcessOperation.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/agenda/ContinueProcessOperation.java
index b97b9fa9ac3..a0daa308d70 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/agenda/ContinueProcessOperation.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/agenda/ContinueProcessOperation.java
@@ -395,6 +395,12 @@ protected void executeBoundaryEvents(List<BoundaryEvent> boundaryEvents, List<Ex
 
             while (boundaryEventsIterator.hasNext() && boundaryEventExecutionsIterator.hasNext()) {
                 BoundaryEvent boundaryEvent = boundaryEventsIterator.next();
+                if (!(boundaryEvent.getBehavior() instanceof BoundaryEventRegistryEventActivityBehavior)) {
+                    if (CollectionUtil.isEmpty(boundaryEvent.getEventDefinitions())
+                            || (boundaryEvent.getEventDefinitions().get(0) instanceof CompensateEventDefinition)) {
+                        continue;
+                    }
+                }
                 ExecutionEntity boundaryEventExecution = boundaryEventExecutionsIterator.next();
                 ActivityBehavior boundaryEventBehavior = ((ActivityBehavior) boundaryEvent.getBehavior());
                 LOGGER.debug("Executing boundary event activityBehavior {} with execution {}", boundaryEventBehavior.getClass(), boundaryEventExecution.getId());
diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/event/compensate/CompensateEventTest.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/event/compensate/CompensateEventTest.java
index b5eed3897d5..1b25aa4cf47 100644
--- a/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/event/compensate/CompensateEventTest.java
+++ b/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/event/compensate/CompensateEventTest.java
@@ -13,12 +13,6 @@
 
 package org.flowable.engine.test.bpmn.event.compensate;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import java.util.HashMap;
-import java.util.Map;
-
 import org.flowable.common.engine.impl.history.HistoryLevel;
 import org.flowable.common.engine.impl.interceptor.Command;
 import org.flowable.common.engine.impl.interceptor.CommandContext;
@@ -34,6 +28,12 @@
 import org.flowable.eventsubscription.service.impl.persistence.entity.EventSubscriptionEntity;
 import org.junit.jupiter.api.Test;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
 /**
  * @author Tijs Rademakers
  */
@@ -337,4 +337,11 @@ public void testCompensateNestedSubprocess() {
 
     }
 
+    @Test
+    @Deployment
+    public void testTwoBoundaryEventAndFirstIsCompensation() {
+        ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("compensateProcess");
+        assertThat(processInstance).isNotNull();
+    }
+
 }
diff --git a/modules/flowable-engine/src/test/resources/org/flowable/engine/test/bpmn/event/compensate/CompensateEventTest.testTwoBoundaryEventAndFirstIsCompensation.bpmn20.xml b/modules/flowable-engine/src/test/resources/org/flowable/engine/test/bpmn/event/compensate/CompensateEventTest.testTwoBoundaryEventAndFirstIsCompensation.bpmn20.xml
new file mode 100644
index 00000000000..5b79cb54cec
--- /dev/null
+++ b/modules/flowable-engine/src/test/resources/org/flowable/engine/test/bpmn/event/compensate/CompensateEventTest.testTwoBoundaryEventAndFirstIsCompensation.bpmn20.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+             xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
+             xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC"
+             xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI"
+             xmlns:flowable="http://flowable.org/bpmn"
+             typeLanguage="http://www.w3.org/2001/XMLSchema"
+             expressionLanguage="http://www.w3.org/1999/XPath"
+             targetNamespace="http://www.flowable.org/processdef">
+
+    <process id="compensateProcess">
+
+        <startEvent id="start"/>
+        <sequenceFlow sourceRef="start" targetRef="user"/>
+        <userTask id="user"/>
+        <boundaryEvent id="compensate" attachedToRef="user">
+            <compensateEventDefinition />
+        </boundaryEvent>
+        <boundaryEvent id="error" attachedToRef="user">
+            <errorEventDefinition errorRef="myError"/>
+        </boundaryEvent>
+
+        <sequenceFlow sourceRef="user" targetRef="end"/>
+        <endEvent id="end"/>
+    </process>
+
+</definitions>
\ No newline at end of file

From 0babcec90b2ea43f0a4983e350105bf8e0c6b01b Mon Sep 17 00:00:00 2001
From: ywling417 <ywl1875938@gmail.com>
Date: Tue, 10 Sep 2024 16:49:52 +0800
Subject: [PATCH 2/2] fixed the project import ordering

---
 .../bpmn/event/compensate/CompensateEventTest.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/event/compensate/CompensateEventTest.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/event/compensate/CompensateEventTest.java
index 1b25aa4cf47..c25010e78bc 100644
--- a/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/event/compensate/CompensateEventTest.java
+++ b/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/event/compensate/CompensateEventTest.java
@@ -13,6 +13,12 @@
 
 package org.flowable.engine.test.bpmn.event.compensate;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.util.HashMap;
+import java.util.Map;
+
 import org.flowable.common.engine.impl.history.HistoryLevel;
 import org.flowable.common.engine.impl.interceptor.Command;
 import org.flowable.common.engine.impl.interceptor.CommandContext;
@@ -28,12 +34,6 @@
 import org.flowable.eventsubscription.service.impl.persistence.entity.EventSubscriptionEntity;
 import org.junit.jupiter.api.Test;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
 /**
  * @author Tijs Rademakers
  */