You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/12/13 02:16:26 UTC
[iotdb] branch rel/0.13 updated: https://issues.apache.org/jira/browse/IOTDB-5157 (#8390)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.13 by this push:
new 21696a967d https://issues.apache.org/jira/browse/IOTDB-5157 (#8390)
21696a967d is described below
commit 21696a967d5549410c84422025f88a7967c2cc97
Author: Pengfei Liu <46...@users.noreply.github.com>
AuthorDate: Tue Dec 13 10:16:20 2022 +0800
https://issues.apache.org/jira/browse/IOTDB-5157 (#8390)
---
.../java/org/apache/iotdb/db/query/control/SessionManager.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java b/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java
index afab3218d7..6169405bf1 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java
@@ -144,7 +144,13 @@ public class SessionManager implements SessionManagerMBean {
boolean enableAudit) {
session.setId(sessionIdGenerator.incrementAndGet());
session.setUsername(username);
- session.setZoneId(ZoneId.of(zoneId));
+ ZoneId curZoneId;
+ if (zoneId != null && !zoneId.trim().isEmpty()) {
+ curZoneId = ZoneId.of(zoneId);
+ } else {
+ curZoneId = ZoneId.systemDefault();
+ }
+ session.setZoneId(curZoneId);
session.setClientVersion(clientVersion);
session.setLogin(true);
session.setLogInTime(System.currentTimeMillis());