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 <[email protected]> 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) {
