From e2b431e2c0f7d9be3e0afee8f0555e91c29470dc Mon Sep 17 00:00:00 2001 From: Phoes Date: Thu, 8 Jul 2021 21:38:20 +0800 Subject: [PATCH] Fix timezone NPE when initializing the connection. --- .../clickhouse/ClickHouseConnectionImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/clickhouse-jdbc/src/main/java/ru/yandex/clickhouse/ClickHouseConnectionImpl.java b/clickhouse-jdbc/src/main/java/ru/yandex/clickhouse/ClickHouseConnectionImpl.java index 1ba8d191e..72f04cf54 100644 --- a/clickhouse-jdbc/src/main/java/ru/yandex/clickhouse/ClickHouseConnectionImpl.java +++ b/clickhouse-jdbc/src/main/java/ru/yandex/clickhouse/ClickHouseConnectionImpl.java @@ -88,6 +88,13 @@ private void initConnection(ClickHouseProperties properties) throws SQLException } serverTimeZone = TimeZone.getTimeZone("UTC"); // just for next query + timezone = serverTimeZone; + if (!properties.isUseServerTimeZone()) { + timezone = Utils.isNullOrEmptyString(properties.getUseTimeZone()) + ? TimeZone.getDefault() + : TimeZone.getTimeZone(properties.getUseTimeZone()); + } + try (Statement s = createStatement(); ResultSet rs = s.executeQuery("select timezone(), version()")) { if (rs.next()) { serverTimeZone = TimeZone.getTimeZone(rs.getString(1)); @@ -95,13 +102,6 @@ private void initConnection(ClickHouseProperties properties) throws SQLException } } - timezone = serverTimeZone; - if (!properties.isUseServerTimeZone()) { - timezone = Utils.isNullOrEmptyString(properties.getUseTimeZone()) - ? TimeZone.getDefault() - : TimeZone.getTimeZone(properties.getUseTimeZone()); - } - if (serverVersion == null) { serverVersion = ""; }