fix NPE

apache · Mar 16, 2024 · 66122a6 · 66122a6
1 parent d56ad10
commit 66122a6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/ConfigService.java b/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/ConfigService.java
@@ -18,6 +18,7 @@
 package org.apache.hugegraph.pd;
 
 import java.util.List;
+import java.util.Objects;
 
 import org.apache.hugegraph.pd.common.PDException;
 import org.apache.hugegraph.pd.config.PDConfig;
@@ -128,7 +129,11 @@ public synchronized PDConfig setPartitionCount(int count) {
      * @throws PDException when io error
      */
     public int getPartitionCount() throws PDException {
-        return getPDConfig().getPartitionCount();
+        Metapb.PDConfig config = getPDConfig();
+        if (Objects.nonNull(config)) {
+            return config.getPartitionCount();
+        }
+        return pdConfig.getInitialPartitionCount();
     }
 
     @Override

diff --git a/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftEngine.java b/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftEngine.java
@@ -159,6 +159,9 @@ public void shutDown() {
     }
 
     public boolean isLeader() {
+        if (Objects.isNull(this.raftNode)) {
+            return false;
+        }
         return this.raftNode.isLeader(true);
     }