Fix NullPointerException

ClickHouse · Jan 6, 2022 · 0dccb76 · 0dccb76
1 parent 59d7652
commit 0dccb76
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/ClickHouseResultSet.java b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/ClickHouseResultSet.java
@@ -348,7 +348,7 @@ public Date getDate(String columnLabel) throws SQLException {
     @Override
     public Date getDate(int columnIndex, Calendar cal) throws SQLException {
         ClickHouseValue value = getValue(columnIndex);
-        if (value == null) {
+        if (value == null || value.isNullOrEmpty()) {
             return null;
         }
 
@@ -588,7 +588,7 @@ public Time getTime(String columnLabel) throws SQLException {
     @Override
     public Time getTime(int columnIndex, Calendar cal) throws SQLException {
         ClickHouseValue value = getValue(columnIndex);
-        if (value == null) {
+        if (value == null || value.isNullOrEmpty()) {
             return null;
         }
 
@@ -619,7 +619,7 @@ public Timestamp getTimestamp(String columnLabel) throws SQLException {
     @Override
     public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException {
         ClickHouseValue value = getValue(columnIndex);
-        if (value == null) {
+        if (value == null || value.isNullOrEmpty()) {
             return null;
         }