Fix failing QA (boolean auto-box thingy)

muthhus · Jul 14, 2015 · cac1d31 · cac1d31
1 parent a70ca1d
commit cac1d31
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/DbSqlSessionFactory.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/DbSqlSessionFactory.java
@@ -325,7 +325,7 @@ protected void initBulkInsertEnabledMap(String databaseType) {
 		}
   }
 
-  public boolean isBulkInsertable(Class<? extends PersistentObject> persistentObjectClass) {
+  public Boolean isBulkInsertable(Class<? extends PersistentObject> persistentObjectClass) {
   	return bulkInsertableMap.get(persistentObjectClass);
   }
 

diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/EntityDependencyOrder.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/EntityDependencyOrder.java
@@ -7,6 +7,7 @@
 import org.activiti.engine.impl.persistence.entity.AttachmentEntity;
 import org.activiti.engine.impl.persistence.entity.ByteArrayEntity;
 import org.activiti.engine.impl.persistence.entity.CommentEntity;
+import org.activiti.engine.impl.persistence.entity.CompensateEventSubscriptionEntity;
 import org.activiti.engine.impl.persistence.entity.DeploymentEntity;
 import org.activiti.engine.impl.persistence.entity.EventLogEntryEntity;
 import org.activiti.engine.impl.persistence.entity.EventSubscriptionEntity;
@@ -28,10 +29,12 @@
 import org.activiti.engine.impl.persistence.entity.JobEntity;
 import org.activiti.engine.impl.persistence.entity.MembershipEntity;
 import org.activiti.engine.impl.persistence.entity.MessageEntity;
+import org.activiti.engine.impl.persistence.entity.MessageEventSubscriptionEntity;
 import org.activiti.engine.impl.persistence.entity.ModelEntity;
 import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
 import org.activiti.engine.impl.persistence.entity.PropertyEntity;
 import org.activiti.engine.impl.persistence.entity.ResourceEntity;
+import org.activiti.engine.impl.persistence.entity.SignalEventSubscriptionEntity;
 import org.activiti.engine.impl.persistence.entity.TaskEntity;
 import org.activiti.engine.impl.persistence.entity.TimerEntity;
 import org.activiti.engine.impl.persistence.entity.UserEntity;
@@ -120,6 +123,22 @@ public class EntityDependencyOrder {
 		 */
 		DELETE_ORDER.add(EventSubscriptionEntity.class);
 
+		/*
+		 * FK to Execution
+		 */
+		DELETE_ORDER.add(CompensateEventSubscriptionEntity.class);
+
+		/*
+		 * FK to Execution
+		 */
+		DELETE_ORDER.add(MessageEventSubscriptionEntity.class);
+
+		/*
+		 * FK to Execution
+		 */
+		DELETE_ORDER.add(SignalEventSubscriptionEntity.class);
+
+
 		/*
 		 * FK to process definition
 		 * FK to Execution
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
       }
-      public boolean isBulkInsertable(Class<? extends PersistentObject> persistentObjectClass) {
+      public Boolean isBulkInsertable(Class<? extends PersistentObject> persistentObjectClass) {
       	return bulkInsertableMap.get(persistentObjectClass);
       }
@@ Expand Down @@