BZ-1032145 JBPM-4170 /rest/runtime/{depId}/history/instance/{procId}/…

…node call throws NPE because of long (instead of Long) field
kiegroup · Nov 20, 2013 · 19267a0 · 19267a0
1 parent fe18c83
commit 19267a0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.../main/java/org/kie/services/client/serialization/jaxb/impl/audit/JaxbNodeInstanceLog.java b/.../main/java/org/kie/services/client/serialization/jaxb/impl/audit/JaxbNodeInstanceLog.java
@@ -10,8 +10,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 
 import org.jbpm.process.audit.NodeInstanceLog;
-import org.jbpm.process.audit.ProcessInstanceLog;
-import org.jbpm.process.audit.event.AuditEvent;
 import org.kie.services.client.serialization.jaxb.impl.JaxbCommandResponse;
 
 @XmlRootElement(name="node-instance-log")
@@ -56,7 +54,7 @@ public class JaxbNodeInstanceLog extends AbstractJaxbHistoryObject<NodeInstanceL
 
     @XmlElement(name="work-item-id")
     @XmlSchemaType(name = "long")
-    private long workItemId;
+    private Long workItemId;
 
     @XmlElement
     @XmlSchemaType(name = "string")
@@ -146,11 +144,11 @@ public void setNodeType(String nodeType) {
         this.nodeType = nodeType;
     }
 
-    public long getWorkItemId() {
+    public Long getWorkItemId() {
         return workItemId;
     }
 
-    public void setWorkItemId(long workItemId) {
+    public void setWorkItemId(Long workItemId) {
         this.workItemId = workItemId;
     }
 

diff --git a/kie-remote/kie-services-client/src/test/java/org/kie/services/client/SerializationTest.java b/kie-remote/kie-services-client/src/test/java/org/kie/services/client/SerializationTest.java
@@ -363,4 +363,11 @@ public void serializingPrimitiveArraysTest() throws Exception  {
         assertNotNull(newCmd);
     }
 
+    @Test
+    // JBPM-4170
+    public void nodeInstanceLogNpeTest() throws Exception { 
+        NodeInstanceLog nodeLog = new NodeInstanceLog();
+        JaxbNodeInstanceLog jaxbNodeLog = new JaxbNodeInstanceLog(nodeLog);
+        testRoundtrip(jaxbNodeLog);
+    }
 }