From 9ce9f86a7bb05f42142561c97db959b21d475bd6 Mon Sep 17 00:00:00 2001
From: Joram Barrez <joram.barrez@gmail.com>
Date: Thu, 27 Aug 2015 10:41:49 +0200
Subject: [PATCH] Adding shortcut for v5 compatibility when flag is false.

---
 .../java/org/activiti/engine/impl/util/Activiti5Util.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/Activiti5Util.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/Activiti5Util.java
index fb9c90884a..f8367618ad 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/Activiti5Util.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/Activiti5Util.java
@@ -30,7 +30,6 @@ public class Activiti5Util {
     }
     
     ProcessDefinitionEntity processDefinitionEntity = ProcessDefinitionUtil.getProcessDefinitionEntity(processDefinitionId, false);
-    
     if (processDefinitionEntity == null) {
       return false;
     }
@@ -39,6 +38,11 @@ public class Activiti5Util {
   }
   
   public static boolean isActiviti5ProcessDefinition(CommandContext commandContext, ProcessDefinitionEntity processDefinitionEntity) {
+    
+    if (!commandContext.getProcessEngineConfiguration().isActiviti5CompatibilityEnabled()) {
+      return false;
+    }
+    
     if (processDefinitionEntity.getEngineVersion() != null) {
       if (Activiti5CompatibilityHandler.ACTIVITI_5_ENGINE_TAG.equals(processDefinitionEntity.getEngineVersion())) {
         if (commandContext.getProcessEngineConfiguration().isActiviti5CompatibilityEnabled()) {
-- 
GitLab