BZ-1195145: Forced a Date Pattern for documents in order to avoid err…

…ors parsing it on front-end
kiegroup · Mar 27, 2015 · 8dcae2a · 8dcae2a
1 parent a908e3c
commit 8dcae2a
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...ime-backend/src/main/java/org/jbpm/console/ng/pr/backend/server/DocumentsServiceImpl.java b/...ime-backend/src/main/java/org/jbpm/console/ng/pr/backend/server/DocumentsServiceImpl.java
@@ -15,8 +15,8 @@
  */
 package org.jbpm.console.ng.pr.backend.server;
 
-import java.text.DateFormat;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -32,6 +32,7 @@
 import org.jbpm.console.ng.pr.model.DocumentSummary;
 import org.jbpm.console.ng.pr.model.ProcessVariableSummary;
 import org.jbpm.console.ng.pr.service.DocumentsService;
+import org.jbpm.document.Document;
 import org.jbpm.services.api.DefinitionService;
 import org.jbpm.services.api.ProcessService;
 import org.jbpm.services.api.RuntimeDataService;
@@ -76,7 +77,9 @@ public PageResponse<DocumentSummary> getData(QueryFilter filter) {
     Map<String, String> properties = new HashMap<String, String>(bpmn2Service.getProcessVariables(deploymentId, processId));
     Collection<ProcessVariableSummary> processVariables = VariableHelper.adaptCollection(dataService.getVariablesCurrentState(processInstanceId), properties,
             processInstanceId);
-
+
+    SimpleDateFormat sdf = new SimpleDateFormat( Document.DOCUMENT_DATE_PATTERN );
+
     List<DocumentSummary> documents = new ArrayList<DocumentSummary>();
     for (ProcessVariableSummary pv : processVariables) {
         if ("org.jbpm.document.Document".equals(pv.getType())) {
@@ -85,8 +88,7 @@ public PageResponse<DocumentSummary> getData(QueryFilter filter) {
                 if (values.length == 4) {
                     Date lastModified = null;
                     try {
-                        lastModified = DateFormat.getDateInstance().parse(values[2]);
-
+                        lastModified = sdf.parse( values[ 2 ] );
                     } catch (ParseException ex) {
                         logger.error("Can not parse last modified date!", ex);
                     }