From feb347e8e1a79381af25453ef8a7d91b4cd80721 Mon Sep 17 00:00:00 2001
From: Joram Barrez <joram.barrez@gmail.com>
Date: Fri, 14 Aug 2015 08:09:04 +0200
Subject: [PATCH] Fix failing job tests

---
 .../activiti/engine/impl/util/Activiti5Util.java    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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 ef14bc30b9..fb9c90884a 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
@@ -24,8 +24,17 @@ import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
 public class Activiti5Util {
   
   public static boolean isActiviti5ProcessDefinitionId(CommandContext commandContext, String processDefinitionId) {
-    ProcessDefinitionEntity processDefinitionEntity = commandContext.getProcessDefinitionEntityManager()
-        .findProcessDefinitionById(processDefinitionId);
+    
+    if (processDefinitionId == null) {
+      return false;
+    }
+    
+    ProcessDefinitionEntity processDefinitionEntity = ProcessDefinitionUtil.getProcessDefinitionEntity(processDefinitionId, false);
+    
+    if (processDefinitionEntity == null) {
+      return false;
+    }
+    
     return isActiviti5ProcessDefinition(commandContext, processDefinitionEntity);
   }
   
-- 
GitLab