BZ-1281864 - Marshalling error accessing remote EJB services app with…

… Sybase DB - revert this wrapping Date objects as sybase driver is required to be present on client side to ensure correctness of the remote invocation This reverts commit 78a35ca. closes #365
kiegroup · Dec 14, 2015 · f4cffb5 · f4cffb5
1 parent 17952cd
commit f4cffb5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/...human-task-audit/src/main/java/org/jbpm/services/task/audit/impl/model/AuditTaskImpl.java b/...human-task-audit/src/main/java/org/jbpm/services/task/audit/impl/model/AuditTaskImpl.java
@@ -72,14 +72,14 @@ public AuditTaskImpl(long taskId, String name, String status, Date activationTim
             long processSessionId, String deploymentId, long parentId, long workItemId) {
         this.taskId = taskId;
         this.status = status;
-        this.activationTime = activationTime == null ? null : new Date(activationTime.getTime());
+        this.activationTime = activationTime;
         this.name = name;
         this.description = description;
         this.priority = priority;
         this.createdBy = createdBy;
-        this.createdOn = createdOn == null ? null : new Date(createdOn.getTime());
+        this.createdOn = createdOn;
         this.actualOwner = actualOwner;
-        this.dueDate = dueDate == null ? null : new Date(dueDate.getTime());
+        this.dueDate = dueDate;
         this.processInstanceId = processInstanceId;
         this.processId = processId;
         this.processSessionId = processSessionId;

diff --git a/...human-task-audit/src/main/java/org/jbpm/services/task/audit/impl/model/TaskEventImpl.java b/...human-task-audit/src/main/java/org/jbpm/services/task/audit/impl/model/TaskEventImpl.java
@@ -86,7 +86,7 @@ public TaskEventImpl(Long taskId, TaskEventType type, String userId, Date logTim
     this.taskId = taskId;
     this.type = type;
     this.userId = userId;
-    this.logTime = logTime == null ? null : new Date(logTime.getTime());
+    this.logTime = logTime;
   }
 
   public TaskEventImpl(Long taskId, TaskEventType type, Long processInstanceId, Long workItemId, String userId, Date logTime) {
@@ -95,7 +95,7 @@ public TaskEventImpl(Long taskId, TaskEventType type, Long processInstanceId, Lo
     this.processInstanceId = processInstanceId;
     this.workItemId = workItemId;
     this.userId = userId;
-    this.logTime = logTime == null ? null : new Date(logTime.getTime());
+    this.logTime = logTime;
   }
 
   public TaskEventImpl(Long taskId, TaskEventType type, Long processInstanceId, Long workItemId, String userId) {

diff --git a/...-task/jbpm-human-task-jpa/src/main/java/org/jbpm/services/task/query/TaskSummaryImpl.java b/...-task/jbpm-human-task-jpa/src/main/java/org/jbpm/services/task/query/TaskSummaryImpl.java
@@ -95,9 +95,9 @@ public TaskSummaryImpl(long id,
         if (createdBy != null) {
             this.createdById = createdBy.getId();
         }
-        this.createdOn = createdOn == null ? null : new Date(createdOn.getTime());
-        this.activationTime = activationTime == null ? null : new Date(activationTime.getTime());
-        this.expirationTime = expirationTime == null ? null : new Date(expirationTime.getTime());
+        this.createdOn = createdOn;
+        this.activationTime = activationTime;
+        this.expirationTime = expirationTime;
         this.processInstanceId = processInstanceId;
         this.processId = processId;
         this.processSessionId = processSessionId;
@@ -138,9 +138,9 @@ public TaskSummaryImpl(long id,
             this.createdBy = TaskModelProvider.getFactory().newUser(this.createdById);
         }
 
-        this.createdOn = createdOn == null ? null : new Date(createdOn.getTime());
-        this.activationTime = activationTime == null ? null : new Date(activationTime.getTime());
-        this.expirationTime = expirationTime == null ? null : new Date(expirationTime.getTime());
+        this.createdOn = createdOn;
+        this.activationTime = activationTime;
+        this.expirationTime = expirationTime;
         this.processInstanceId = processInstanceId;
         this.processId = processId;
         this.processSessionId = processSessionId;
@@ -180,9 +180,9 @@ public TaskSummaryImpl(long id,
         this.priority = priority;
         this.actualOwnerId = actualOwner;
         this.createdById = createdBy;
-        this.createdOn = createdOn == null ? null : new Date(createdOn.getTime());
-        this.activationTime = activationTime == null ? null : new Date(activationTime.getTime());
-        this.expirationTime = expirationTime == null ? null : new Date(expirationTime.getTime());
+        this.createdOn = createdOn;
+        this.activationTime = activationTime;
+        this.expirationTime = expirationTime;
         this.processId = processId;
         this.parentId = parentId;
         this.deploymentId = deploymentId;

diff --git a/...jbpm-kie-services/src/main/java/org/jbpm/kie/services/impl/model/ProcessInstanceDesc.java b/...jbpm-kie-services/src/main/java/org/jbpm/kie/services/impl/model/ProcessInstanceDesc.java
@@ -72,7 +72,7 @@ public ProcessInstanceDesc(long id, String processId, String processName, String
        this.processVersion = processVersion==null?"":processVersion;
        this.state = state;
        this.deploymentId = deploymentId;
-       this.dataTimeStamp = dataTimeStamp == null?null:new Date(dataTimeStamp.getTime());
+       this.dataTimeStamp = dataTimeStamp;
        this.initiator = initiator;
        this.correlationKey = correlationKey==null?"":correlationKey;
    }