[iotdb] branch master updated: Fix open session bug (#1905)

[haonan]

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new e897267  Fix open session bug (#1905)
e897267 is described below

commit e897267cd9df81b9b03012810238e8a4211592b7
Author: Xiangwei Wei <34242296+alima...@users.noreply.github.com>
AuthorDate: Fri Oct 30 18:20:40 2020 +0800

    Fix open session bug (#1905)
---
 jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java |  6 +++---
 session/src/main/java/org/apache/iotdb/session/Session.java   | 10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java 
b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
index 1924cfc..85464cd 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
@@ -487,10 +487,10 @@ public class IoTDBConnection implements Connection {
   }
 
   public String getTimeZone() {
-    if (zoneId != null) {
-      return zoneId.toString();
+    if (zoneId == null) {
+      zoneId = ZoneId.systemDefault();
     }
-    return ZoneId.systemDefault().getId();
+    return zoneId.toString();
   }
 
   public void setTimeZone(String zoneId) throws TException, IoTDBSQLException {
diff --git a/session/src/main/java/org/apache/iotdb/session/Session.java 
b/session/src/main/java/org/apache/iotdb/session/Session.java
index 4582dbb..91e8e94 100644
--- a/session/src/main/java/org/apache/iotdb/session/Session.java
+++ b/session/src/main/java/org/apache/iotdb/session/Session.java
@@ -97,6 +97,10 @@ public class Session {
     this(host, rpcPort, username, password, Config.DEFAULT_FETCH_SIZE, null);
   }
 
+  public Session(String host, int rpcPort, String username, String password, 
int fetchSize) {
+    this(host, rpcPort, username, password, fetchSize, null);
+  }
+
   public Session(String host, int rpcPort, String username, String password, 
ZoneId zoneId) {
     this(host, rpcPort, username, password, Config.DEFAULT_FETCH_SIZE, zoneId);
   }
@@ -917,10 +921,10 @@ public class Session {
   }
 
   public synchronized String getTimeZone() {
-    if (zoneId != null) {
-      return zoneId.toString();
+    if (zoneId == null) {
+      zoneId = ZoneId.systemDefault();
     }
-    return ZoneId.systemDefault().getId();
+    return zoneId.toString();
   }
 
   public synchronized void setTimeZone(String zoneId)