From 66122a6a0c92266173776693525af534face8ce8 Mon Sep 17 00:00:00 2001
From: VGalaxies <vgalaxies@apache.org>
Date: Sat, 16 Mar 2024 12:16:02 +0800
Subject: [PATCH] fix NPE

---
 .../main/java/org/apache/hugegraph/pd/ConfigService.java   | 7 ++++++-
 .../main/java/org/apache/hugegraph/pd/raft/RaftEngine.java | 3 +++
 2 files changed, 9 insertions(+), 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
index 2557745c88..4a05b57ee9 100644
--- 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
index f3089ed074..6882585a08 100644
--- 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);
     }