From fb76b321edd80d3e4c68bea010eeb8a75b4124a4 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Tue, 28 Sep 2021 10:55:21 +0300
Subject: [PATCH] CB-951 Connection info read fix

---
 .../src/io/cloudbeaver/model/WebConnectionInfo.java            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebConnectionInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebConnectionInfo.java
index 3eef9a23ac..07bd96fca1 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebConnectionInfo.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebConnectionInfo.java
@@ -165,7 +165,8 @@ public class WebConnectionInfo {
 
     @Property
     public String getConnectTime() {
-        return CBConstants.ISO_DATE_FORMAT.format(dataSourceContainer.getConnectTime());
+        return dataSourceContainer.getConnectTime() == null ? null :
+            CBConstants.ISO_DATE_FORMAT.format(dataSourceContainer.getConnectTime());
     }
 
     @Property