You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2022/12/07 10:23:21 UTC

[iotdb] branch rel/1.0 updated: [IOTDB-5090] Add npe check in DataNode (#8328) (#8337)

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

caogaofei pushed a commit to branch rel/1.0
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/1.0 by this push:
     new bdadfb5bee [IOTDB-5090] Add npe check in DataNode (#8328) (#8337)
bdadfb5bee is described below

commit bdadfb5bee9bcf43330c5a2eaa900577852c57a9
Author: Itami Sho <42...@users.noreply.github.com>
AuthorDate: Wed Dec 7 18:23:14 2022 +0800

    [IOTDB-5090] Add npe check in DataNode (#8328) (#8337)
---
 server/src/main/java/org/apache/iotdb/db/service/DataNode.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/service/DataNode.java b/server/src/main/java/org/apache/iotdb/db/service/DataNode.java
index 5bb1a9b474..8f4989f3d0 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/DataNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/DataNode.java
@@ -670,8 +670,12 @@ public class DataNode implements DataNodeMBean {
 
     try {
       MetricService.getInstance().stop();
-      SchemaRegionConsensusImpl.getInstance().stop();
-      DataRegionConsensusImpl.getInstance().stop();
+      if (SchemaRegionConsensusImpl.getInstance() != null) {
+        SchemaRegionConsensusImpl.getInstance().stop();
+      }
+      if (DataRegionConsensusImpl.getInstance() != null) {
+        DataRegionConsensusImpl.getInstance().stop();
+      }
     } catch (Exception e) {
       logger.error("Stop data node error", e);
     }