From b44784ead9bc5e8f8f3e8139039b4396e95f490e Mon Sep 17 00:00:00 2001
From: alaskowski <alaskowski@ethz.ch>
Date: Mon, 15 May 2023 17:29:51 +0200
Subject: [PATCH] SSDM-13524: fixed timestamps parsing
---
.../openbis/generic/shared/dto/types/TimestampArrayType.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/types/TimestampArrayType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/types/TimestampArrayType.java
index f43f9d3d014..98dd4f456c1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/types/TimestampArrayType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/types/TimestampArrayType.java
@@ -25,6 +25,7 @@ import org.hibernate.usertype.UserType;
import java.io.Serializable;
import java.sql.*;
import java.text.SimpleDateFormat;
+import java.time.ZonedDateTime;
import java.util.Arrays;
import java.util.Date;
import java.util.Objects;
@@ -73,7 +74,7 @@ public class TimestampArrayType implements UserType
}
private Date parseDate(String date) {
- SimpleDateFormat format=new SimpleDateFormat(BasicConstant.CANONICAL_DATE_FORMAT_PATTERN);
+ SimpleDateFormat format=new SimpleDateFormat("yyyy-MM-dd HH:mm:ssX");
try{
return format.parse(date);
} catch (Exception e) {
--
GitLab