[jbpm-commits] JBoss JBPM SVN: r5902 - in jbpm4/trunk: modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms and 1 other directory.
Author: jbarrez
Date: 2009-12-02 17:10:20 -0500 (Wed, 02 Dec 2009)
New Revision: 5902
Modified:
jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskFormDispatcher.java
jbpm4/trunk/pom.xml
Log:
Fix for JBPM-2639: task with taskform+timer leads to NPE in console when clicking
'view' on task
Modified:
jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskFormDispatcher.java
===================================================================
---
jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskFormDispatcher.java 2009-12-02
21:39:52 UTC (rev 5901)
+++
jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskFormDispatcher.java 2009-12-02
22:10:20 UTC (rev 5902)
@@ -140,14 +140,15 @@
RepositoryService repoService = processEngine.getRepositoryService();
ExecutionService execService = processEngine.getExecutionService();
- ProcessInstance instance = execService.createProcessInstanceQuery()
- .processInstanceId(executionId)
- .uniqueResult();
+ Execution execution = execService.findExecutionById(executionId);
+
+ if (execution != null) {
+ ProcessDefinition definition = repoService.createProcessDefinitionQuery()
+ .processDefinitionId(execution.getProcessDefinitionId()).uniqueResult();
+ InputStream in = repoService.getResourceAsStream(definition.getDeploymentId(),
PROCESSFORMS_CSS);
+ return in;
+ }
- ProcessDefinition definition = repoService.createProcessDefinitionQuery()
- .processDefinitionId(instance.getProcessDefinitionId()).uniqueResult();
-
- InputStream in = repoService.getResourceAsStream(definition.getDeploymentId(),
PROCESSFORMS_CSS);
- return in;
+ return null;
}
}
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2009-12-02 21:39:52 UTC (rev 5901)
+++ jbpm4/trunk/pom.xml 2009-12-02 22:10:20 UTC (rev 5902)
@@ -52,7 +52,7 @@
<cactus.version>1.8.1</cactus.version>
<aspectjrt.version>1.5.3</aspectjrt.version>
<freemarker.version>2.3.15</freemarker.version>
- <gwt.console.version>1.2.0-SNAPSHOT</gwt.console.version>
+ <gwt.console.version>1.2.1</gwt.console.version>
<jbpm.gpd.version>4.2</jbpm.gpd.version>
<hibernate.version>3.3.1.GA</hibernate.version>
<slf4j.version>1.5.2</slf4j.version>