From 63476a25d2cff87d1689a9b4a6afdbd415624c14 Mon Sep 17 00:00:00 2001
From: JackyYangPassion <yang.jiaqi.hadoop@gmail.com>
Date: Wed, 6 Jul 2022 20:07:21 +0800
Subject: [PATCH] fix start rpcServer NPE

---
 .../com/baidu/hugegraph/core/GraphManager.java     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/core/GraphManager.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/core/GraphManager.java
index 896c95861e..83859a76e7 100644
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/core/GraphManager.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/core/GraphManager.java
@@ -380,12 +380,14 @@ private void loadGraph(String name, String graphConfPath) {
 
     private void waitGraphsReady() {
         if (!this.rpcServer.enabled()) {
-            com.alipay.remoting.rpc.RpcServer remotingRpcServer =
-                                              this.remotingRpcServer();
-            for (String graphName : this.graphs.keySet()) {
-                HugeGraph graph = this.graph(graphName);
-                graph.waitReady(remotingRpcServer);
-            }
+            LOG.info("RpcServer is not enabled, skip wait graphs ready");
+            return;
+        }
+        com.alipay.remoting.rpc.RpcServer remotingRpcServer =
+                                          this.remotingRpcServer();
+        for (String graphName : this.graphs.keySet()) {
+            HugeGraph graph = this.graph(graphName);
+            graph.waitReady(remotingRpcServer);
         }
     }