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 2020/08/04 04:32:54 UTC
[incubator-iotdb] 01/02: fix null pointer bug
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.10
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 6e6b657efaa28a3f7906d7ccf58801c9307efcd9
Author: qiaojialin <64...@qq.com>
AuthorDate: Mon Aug 3 14:02:33 2020 +0800
fix null pointer bug
---
.../org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java | 6 +++++-
server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java | 3 +++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java b/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
index 89e43db..03d5d01 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
@@ -160,7 +160,11 @@ public class TimeSeriesMetadataCache {
}
}
}
- return new TimeseriesMetadata(timeseriesMetadata);
+ if (timeseriesMetadata == null) {
+ return null;
+ } else {
+ return new TimeseriesMetadata(timeseriesMetadata);
+ }
}
diff --git a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index 95b5d21..3e8c159 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -593,6 +593,9 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
}
return resp;
+ } catch (NullPointerException e) {
+ e.printStackTrace();
+ return RpcUtils.getTSExecuteStatementResp(TSStatusCode.INTERNAL_SERVER_ERROR, e.getMessage());
} catch (Exception e) {
logger.error("{}: Internal server error: ", IoTDBConstant.GLOBAL_DB_NAME, e);
if (queryId != -1) {