Removing use of DbSqlSession from ExecuteInactiveBehaviorsOperation

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());

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