[incubator-iotdb] branch master updated: fix timeseries metadata cache return null bug (#1280)

[qiaojialin]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4466180  fix timeseries metadata cache return null bug (#1280)
4466180 is described below

commit 4466180b15285c8950bb700ddea76ecc5efa9a02
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Thu May 28 13:47:49 2020 +0800

    fix timeseries metadata cache return null bug (#1280)
    
    * fix timeseries metadata cache bug
---
 .../org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java  | 7 ++++++-
 1 file changed, 6 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 7c59d05..aa3a846 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
@@ -144,7 +144,12 @@ public class TimeSeriesMetadataCache {
       timeSeriesMetadataList.forEach(timeseriesMetadata ->
           lruCache.put(new TimeSeriesMetadataCacheKey(key.filePath, key.device,
               timeseriesMetadata.getMeasurementId()), timeseriesMetadata));
-      return new TimeseriesMetadata(lruCache.get(key));
+      TimeseriesMetadata metadata = lruCache.get(key);
+      if (metadata == null) {
+        return null;
+      } else {
+        return new TimeseriesMetadata(metadata);
+      }
     } catch (IOException e) {
       logger.error("something wrong happened while reading {}", key.filePath);
       throw e;