(incubator-hugegraph) branch pd-store updated: fix(pd): log4j version conflict & follower NPE (#2339)

[ming]

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

ming pushed a commit to branch pd-store
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git


The following commit(s) were added to refs/heads/pd-store by this push:
     new 823b1902e fix(pd): log4j version conflict & follower NPE (#2339)
823b1902e is described below

commit 823b1902eb1182e7d60c59f0443ee2e6c39efa49
Author: Simon Cheung <m...@apache.org>
AuthorDate: Mon Oct 30 16:32:59 2023 +0800

    fix(pd): log4j version conflict & follower NPE (#2339)
    
    * fix: log4j version conflict
    
    * Update RaftRpcClient.java
---
 .../src/main/java/org/apache/hugegraph/pd/raft/RaftRpcClient.java   | 2 +-
 hugegraph-pd/hg-pd-service/pom.xml                                  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git 
a/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftRpcClient.java
 
b/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftRpcClient.java
index 2dfe3b306..1dafc43b2 100644
--- 
a/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftRpcClient.java
+++ 
b/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftRpcClient.java
@@ -59,7 +59,7 @@ public class RaftRpcClient {
     private <V> void internalCallAsyncWithRpc(final Endpoint endpoint,
                                               final 
RaftRpcProcessor.BaseRequest request,
                                               final FutureClosureAdapter<V> 
closure) {
-        final InvokeContext invokeCtx = null;
+        final InvokeContext invokeCtx = new InvokeContext();
         final InvokeCallback invokeCallback = new InvokeCallback() {
 
             @Override
diff --git a/hugegraph-pd/hg-pd-service/pom.xml 
b/hugegraph-pd/hg-pd-service/pom.xml
index ca2e68d94..fcbbeaf94 100644
--- a/hugegraph-pd/hg-pd-service/pom.xml
+++ b/hugegraph-pd/hg-pd-service/pom.xml
@@ -99,6 +99,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-log4j2</artifactId>
             <version>2.5.14</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>log4j-slf4j-impl</artifactId>
+                    <groupId>org.apache.logging.log4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.lmax</groupId>