From 14f02254009c7dd890db28ea9d8155b8e09207b4 Mon Sep 17 00:00:00 2001 From: Frederik Heremans Date: Thu, 12 Jul 2012 08:31:46 +0000 Subject: [PATCH] Merged BRANCHES/DEV/V4.1-BUG-FIX/root to HEAD/root: 39152: ALF-13211: Accepted path for preventing NPE when viewing JBPM sub-process which has no start-task git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@39158 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java index 26b5e05e66..77943e958b 100644 --- a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java +++ b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java @@ -2579,6 +2579,10 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine return null; } Task startTask = processInstance.getProcessDefinition().getTaskMgmtDefinition().getStartTask(); + if(startTask == null) + { + return null; + } // retrieve task Session session = context.getSession(); @@ -2587,6 +2591,10 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine Criteria process = taskCriteria.createCriteria("processInstance"); process.add(Restrictions.eq("id", processInstance.getId())); TaskInstance taskInstance = (TaskInstance) taskCriteria.uniqueResult(); + if(taskInstance == null) + { + return null; + } return createWorkflowTask(taskInstance); } });