Dispose KieSession after rules execution when using ruleFlowGroup (#3678

) * Dispose KieSession after rules execution when using ruleFlowGroup
apache · Sep 24, 2024 · 5810447 · 5810447
1 parent 0fbddf3
commit 5810447
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/jbpm/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/rule/RuleFlowGroupRuleTypeEngineImpl.java b/jbpm/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/rule/RuleFlowGroupRuleTypeEngineImpl.java
@@ -73,6 +73,9 @@ public void evaluate(RuleSetNodeInstance rsni, String ruleFlowGroup) {
             rsni.removeEventListeners();
             rsni.retractFacts(kruntime);
             rsni.triggerCompleted();
+            if (kruntime instanceof KieSession) {
+                ((KieSession) kruntime).dispose();
+            }
         }
     }
 

diff --git a/jbpm/jbpm-tests/src/test/java/org/jbpm/bpmn2/ActivityTest.java b/jbpm/jbpm-tests/src/test/java/org/jbpm/bpmn2/ActivityTest.java
@@ -363,7 +363,6 @@ public void testRuleTask() throws Exception {
         List<String> list = new ArrayList<>();
         kruntime.getKieSession().setGlobal("list", list);
         KogitoProcessInstance processInstance = kruntime.startProcess("RuleTask");
-        kruntime.getKieSession().setGlobal("list", list);
         assertThat(list).hasSize(1);
         assertProcessInstanceFinished(processInstance, kruntime);
     }
@@ -452,14 +451,16 @@ public void afterMatchFired(AfterMatchFiredEvent event) {
 
         params = new HashMap<>();
 
-        processInstance = kruntime.startProcess("RuleTask", params);
+        KogitoProcessRuntime kruntime2 = createKogitoProcessRuntime("BPMN2-RuleTaskWithFact.bpmn2", "BPMN2-RuleTask3.drl");
+        processInstance = kruntime2.startProcess("RuleTask", params);
 
         assertThat(processInstance.getState()).isEqualTo(KogitoProcessInstance.STATE_ERROR);
 
+        KogitoProcessRuntime kruntime3 = createKogitoProcessRuntime("BPMN2-RuleTaskWithFact.bpmn2", "BPMN2-RuleTask3.drl");
         params = new HashMap<>();
         params.put("x", "SomeString");
-        processInstance = kruntime.startProcess("RuleTask", params);
-        assertProcessInstanceFinished(processInstance, kruntime);
+        processInstance = kruntime3.startProcess("RuleTask", params);
+        assertProcessInstanceFinished(processInstance, kruntime3);
     }
 
     @Test
@@ -475,7 +476,6 @@ public void testRuleTaskAcrossSessions() throws Exception {
         KogitoProcessInstance processInstance2 = kruntime2.startProcess("RuleTask");
         assertProcessInstanceFinished(processInstance1, kruntime);
         assertProcessInstanceFinished(processInstance2, kruntime2);
-        kruntime2.getKieSession().dispose(); // kruntime's session is disposed in the @AfterEach method
     }
 
     @Test