From e19b3b0c9ccb2a1f41f5c5eed034f9a2609ce56d Mon Sep 17 00:00:00 2001
From: Joram Barrez <joram.barrez@gmail.com>
Date: Thu, 10 Sep 2015 15:09:16 +0200
Subject: [PATCH] Removing use of DbSqlSession from
 ExecuteInactiveBehaviorsOperation

---
 .../agenda/ExecuteInactiveBehaviorsOperation.java  |  2 +-
 .../entity/ExecutionEntityManagerImpl.java         | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/agenda/ExecuteInactiveBehaviorsOperation.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/agenda/ExecuteInactiveBehaviorsOperation.java
index 00af4eca30..ceb5f22a84 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/agenda/ExecuteInactiveBehaviorsOperation.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/agenda/ExecuteInactiveBehaviorsOperation.java
@@ -51,7 +51,7 @@ public class ExecuteInactiveBehaviorsOperation extends AbstractOperation {
         Collection<ExecutionEntity> inactiveExecutions = commandContext.getExecutionEntityManager().findInactiveExecutionsByProcessInstanceId(executionEntity.getProcessInstanceId());
         for (ExecutionEntity inactiveExecution : inactiveExecutions) {
           if (!inactiveExecution.isActive() && flowNodeIdsWithInactivatedBehavior.contains(inactiveExecution.getActivityId())
-              && !commandContext.getDbSqlSession().isEntityToBeDeleted(inactiveExecution)) {
+              && !inactiveExecution.isDeleted()) {
 
             FlowNode flowNode = (FlowNode) process.getFlowElement(inactiveExecution.getActivityId(), true);
             InactiveActivityBehavior inactiveActivityBehavior = ((InactiveActivityBehavior) flowNode.getBehavior());
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManagerImpl.java
index 7d2381f2da..01800435ba 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManagerImpl.java
@@ -59,6 +59,20 @@ public class ExecutionEntityManagerImpl extends AbstractEntityManager<ExecutionE
   protected DataManager<ExecutionEntity> getDataManager() {
     return executionDataManager;
   }
+
+  // Overriding the default delete methods to set the 'isDeleted' flag
+  
+  @Override
+  public void delete(ExecutionEntity entity) {
+    super.delete(entity);
+    entity.setDeleted(true);
+  }
+  
+  @Override
+  public void delete(ExecutionEntity entity, boolean fireDeleteEvent) {
+    super.delete(entity, fireDeleteEvent);
+    entity.setDeleted(true);
+  }
   
   // FIND METHODS
 
-- 
GitLab