inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/DEV/V4.1-BUG-FIX/root to HEAD/root:

Browse Source 
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
This commit is contained in:
Frederik Heremans
2012-07-12 08:31:46 +00:00
parent 5202c61772
commit 14f0225400
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java
View File

@@ -2579,6 +2579,10 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
return null; return null;
} }
Task startTask = processInstance.getProcessDefinition().getTaskMgmtDefinition().getStartTask(); Task startTask = processInstance.getProcessDefinition().getTaskMgmtDefinition().getStartTask();
if(startTask == null)
{
return null;
}
// retrieve task // retrieve task
Session session = context.getSession(); Session session = context.getSession();
@@ -2587,6 +2591,10 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
Criteria process = taskCriteria.createCriteria("processInstance"); Criteria process = taskCriteria.createCriteria("processInstance");
process.add(Restrictions.eq("id", processInstance.getId())); process.add(Restrictions.eq("id", processInstance.getId()));
TaskInstance taskInstance = (TaskInstance) taskCriteria.uniqueResult(); TaskInstance taskInstance = (TaskInstance) taskCriteria.uniqueResult();
if(taskInstance == null)
{
return null;
}
return createWorkflowTask(taskInstance); return createWorkflowTask(taskInstance);
} }
}); });