Author: jbarrez
Date: 2009-12-02 16:39:52 -0500 (Wed, 02 Dec 2009)
New Revision: 5901
Modified:
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java
Log:
Fix for NPE in task without executionId
Modified:
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java
===================================================================
---
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-12-01
23:46:46 UTC (rev 5900)
+++
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-12-02
21:39:52 UTC (rev 5901)
@@ -153,10 +153,17 @@
task.setCreateDate(jbpmTask.getCreateTime());
ExecutionService executionService =
ProcessEngineUtil.retrieveProcessEngine().getExecutionService();
- Execution pi =
executionService.findExecutionById(jbpmTask.getExecutionId()).getProcessInstance();
- task.setProcessInstanceId(pi.getId());
- task.setProcessId(pi.getProcessDefinitionId());
+ String executionId = jbpmTask.getExecutionId();
+ if (executionId != null) { // otherwise we're dealing with a standalone task
+ Execution execution = executionService.findExecutionById(executionId);
+ if (execution != null) {
+ Execution pi = execution.getProcessInstance();
+ task.setProcessInstanceId(pi.getId());
+ task.setProcessId(pi.getProcessDefinitionId());
+ }
+ }
+
// cast
//TaskImpl cast = ((TaskImpl) jbpmTask);
//task.setSignalling(cast.isSignalling()); // TODO: Still needed?