Fix for #3817 Bulk delete Operations with custom Entities are not executed by DbSqlSession

activiti-core/activiti-engine/src/main/java/org/activiti/engine/impl/db/DbSqlSession.java

@@ -880,11 +880,16 @@ protected void flushDeletes() {
             for (Class<? extends Entity> entityClass : deletedObjects.keySet()) {
                 flushDeleteEntities(entityClass,
                                     deletedObjects.get(entityClass).values());
+            }
+        }
+        if (bulkDeleteOperations.size() > 0) {
+            for (Class<? extends Entity> entityClass : bulkDeleteOperations.keySet())  {
                 flushBulkDeletes(entityClass);
             }
         }
 
         deletedObjects.clear();
+        bulkDeleteOperations.clear();
     }
 
     protected void flushBulkDeletes(Class<? extends Entity> entityClass) {
@@ -893,6 +898,7 @@ protected void flushBulkDeletes(Class<? extends Entity> entityClass) {
             for (BulkDeleteOperation bulkDeleteOperation : bulkDeleteOperations.get(entityClass)) {
                 bulkDeleteOperation.execute(sqlSession);
             }
+            bulkDeleteOperations.remove(entityClass);
         }
     }
 

activiti-core/activiti-engine/src/test/java/org/activiti/engine/impl/db/DbSqlSessionTest.java

@@ -0,0 +1,59 @@
+package org.activiti.engine.impl.db;
+
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.verify;
+
+import org.activiti.engine.impl.persistence.entity.AbstractEntity;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DbSqlSessionTest
+{
+  @Mock
+  private DbSqlSessionFactory dbSqlSessionFactoryMock;
+
+  @Mock
+  private SqlSessionFactory sqlSessionFactoryMock;
+
+  @Mock
+  private SqlSession sqlSessionMock;
+
+  private DbSqlSession dbSqlSession;
+
+  @Before
+  public void constructDbSqlSession()
+  {
+    when(dbSqlSessionFactoryMock.getSqlSessionFactory()).thenReturn(sqlSessionFactoryMock);
+    when(sqlSessionFactoryMock.openSession()).thenReturn(sqlSessionMock);
+    when(dbSqlSessionFactoryMock.mapStatement("someStatement")).thenReturn("someMappedStatement");
+
+    dbSqlSession = new DbSqlSession(dbSqlSessionFactoryMock, null);
+  }
+
+  @Test
+  public void testFlushDeletesWithCustomEntityBulkDeletion()
+  {
+    dbSqlSession.delete("someStatement", "myParam", CustomEntity.class);
+
+    // act
+    dbSqlSession.flushDeletes();
+
+    // assert
+    verify(sqlSessionMock).delete("someMappedStatement", "myParam");
+  }
+
+  private static class CustomEntity extends AbstractEntity
+  {
+    @Override
+    public Object getPersistentState()
+    {
+      return null;
+    }
+  }
+}