[jbpm-commits] JBoss JBPM SVN: r5091 - in jbpm4/trunk/modules: test-db/src/test/java/org/jbpm/test/task and 1 other directory.

[do-not-reply at jboss.org]

Author: jbarrez
Date: 2009-06-23 06:24:40 -0400 (Tue, 23 Jun 2009)
New Revision: 5091

Modified:
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java
Log:
Fix for JBPM-2340

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java	2009-06-23 10:15:15 UTC (rev 5090)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java	2009-06-23 10:24:40 UTC (rev 5091)
@@ -22,6 +22,7 @@
 package org.jbpm.pvm.internal.cmd;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.jbpm.api.cmd.Command;
@@ -47,9 +48,14 @@
   public List<Comment> execute(Environment environment) throws Exception {
     DbSession dbSession = environment.get(DbSession.class);
     TaskImpl task = dbSession.get(TaskImpl.class, taskDbid);
-    List<Comment> comments = task.getComments();
-    forceInitializationAndClean(comments);
-    return comments;
+    
+    if (task != null) {
+      List<Comment> comments = task.getComments();
+      forceInitializationAndClean(comments);
+      return comments;
+    } else {
+      return Collections.emptyList();
+    }    
   }
 
   protected void forceInitializationAndClean(List<Comment> comments) {

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java	2009-06-23 10:15:15 UTC (rev 5090)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java	2009-06-23 10:24:40 UTC (rev 5091)
@@ -69,4 +69,10 @@
     // will show up as a fixme.
     taskService.deleteTask(taskDbid);
   }
+  
+  public void testGetTaskCommentsWithUnexistingTaskId() {
+    List<Comment> comments = taskService.getTaskComments(-1234L);
+    assertTrue(comments.isEmpty());
+  }
+  
 }