[overlord-commits] Overlord SVN: r905 - bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model.

[overlord-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2009-12-14 10:04:23 -0500 (Mon, 14 Dec 2009)
New Revision: 905

Modified:
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
Log:
Fix standalone tasks: Parsing did throw NPE

Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java	2009-12-11 14:49:06 UTC (rev 904)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java	2009-12-14 15:04:23 UTC (rev 905)
@@ -38,6 +38,8 @@
 {  
   public static List<TaskRef> parseTaskReferenceList(String json)
   {
+    ConsoleLog.debug("parse " + json);
+
     List<TaskRef> results = new ArrayList<TaskRef>();
 
     JSONValue root = JSONParser.parse(json);
@@ -58,11 +60,15 @@
     ConsoleLog.debug("parse " + item);
 
     long id = JSONWalk.on(item).next("id").asLong();
+
+    // optional instanceId
     JSONWalk.JSONWrapper instanceIdWrapper = JSONWalk.on(item).next("processInstanceId");
-    String executionId = instanceIdWrapper!=null ?
-        instanceIdWrapper.asString() : "n/a";
-    
-    String processId = JSONWalk.on(item).next("processId").asString();
+    String executionId = instanceIdWrapper!=null ? instanceIdWrapper.asString() : "n/a";
+
+    // optional processId
+    JSONWalk.JSONWrapper processIdWrapper = JSONWalk.on(item).next("processId");
+    String processId = processIdWrapper != null ? processIdWrapper.asString() : "n/a";
+
     String name = JSONWalk.on(item).next("name").asString();
     String assignee = JSONWalk.on(item).next("assignee").asString();
     boolean isBlocking = JSONWalk.on(item).next("isBlocking").asBool();
@@ -331,6 +337,5 @@
     }
 
     return result;
-  }
-
+  }  
 }