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/03 06:02:59 UTC
[incubator-iotdb] branch fix_null_pointer created (now 4c19374)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch fix_null_pointer
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 4c19374 fix null pointer bug
This branch includes the following new commits:
new 4c19374 fix null pointer bug
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-iotdb] 01/01: fix null pointer bug
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch fix_null_pointer
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 4c1937429ce8c34f5d930bbdf3f3ca7a0b025dab
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) {