bugfix data follow sync from leader acceptorManager NullPointer Exception

huanglongchao · huanglongchao · commit c9579cf91b6c · 2024-06-25T17:01:52.000+08:00
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.5.1
+6.5.2
diff --git a/client/all/pom.xml b/client/all/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.alipay.sofa</groupId>
     <artifactId>registry-client-all</artifactId>
-    <version>6.5.1</version>
+    <version>6.5.2</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <url>http://github.com/alipay/sofa-registry</url>
diff --git a/client/api/pom.xml b/client/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/client/impl/pom.xml b/client/impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/client/log/pom.xml b/client/log/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/client/pom.xml b/client/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alipay.sofa</groupId>
     <artifactId>registry-parent</artifactId>
-    <version>6.5.1</version>
+    <version>6.5.2</version>
 
     <packaging>pom</packaging>
 
diff --git a/server/common/model/pom.xml b/server/common/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-common</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/common/model/src/main/java/com/alipay/sofa/registry/common/model/PublisherUtils.java b/server/common/model/src/main/java/com/alipay/sofa/registry/common/model/PublisherUtils.java
@@ -56,7 +56,7 @@ public static Map<String, DatumSummary> getDatumSummary(
     for (Map.Entry<String, Map<String, Publisher>> e : publisherMap.entrySet()) {
 
       // filter dataInfoId
-      if (!acceptorManager.accept(SyncAcceptorRequest.buildRequest(e.getKey()))) {
+      if (acceptorManager != null && !acceptorManager.accept(SyncAcceptorRequest.buildRequest(e.getKey()))) {
         continue;
       }
 
diff --git a/server/common/model/src/main/java/com/alipay/sofa/registry/common/model/dataserver/DatumSummary.java b/server/common/model/src/main/java/com/alipay/sofa/registry/common/model/dataserver/DatumSummary.java
@@ -52,7 +52,7 @@ public static DatumSummary of(
     Map<String, RegisterVersion> versionMap = Maps.newHashMapWithExpectedSize(publisherMap.size());
     for (Map.Entry<String, Publisher> e : publisherMap.entrySet()) {
       // filter publisher
-      if (!acceptorManager.accept(
+      if (acceptorManager != null && !acceptorManager.accept(
           SyncAcceptorRequest.buildRequest(dataInfoId, e.getValue().getPublishSource()))) {
         continue;
       }
diff --git a/server/common/pom.xml b/server/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server-parent</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/common/util/pom.xml b/server/common/util/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-common</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/distribution/all/pom.xml b/server/distribution/all/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-distribution</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/distribution/pom.xml b/server/distribution/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server-parent</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/pom.xml b/server/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/remoting/api/pom.xml b/server/remoting/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-remoting</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/remoting/bolt/pom.xml b/server/remoting/bolt/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-remoting</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/remoting/http/pom.xml b/server/remoting/http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-remoting</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/remoting/pom.xml b/server/remoting/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server-parent</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/server/data/pom.xml b/server/server/data/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/server/integration/pom.xml b/server/server/integration/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/server/meta/pom.xml b/server/server/meta/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/server/pom.xml b/server/server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server-parent</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/server/session/pom.xml b/server/server/session/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/server/shared/pom.xml b/server/server/shared/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>registry-server</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/store/api/pom.xml b/server/store/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-store</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/store/jdbc/pom.xml b/server/store/jdbc/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-store</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/store/jraft/pom.xml b/server/store/jraft/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-store</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/store/pom.xml b/server/store/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server-parent</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/pom.xml b/test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>6.5.1</version>
+        <version>6.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public static Map<String, DatumSummary> getDatumSummary(`
`56`	`56`	`for (Map.Entry<String, Map<String, Publisher>> e : publisherMap.entrySet()) {`
`57`	`57`
`58`	`58`	`// filter dataInfoId`
`59`		`- if (!acceptorManager.accept(SyncAcceptorRequest.buildRequest(e.getKey()))) {`
	`59`	`+ if (acceptorManager != null && !acceptorManager.accept(SyncAcceptorRequest.buildRequest(e.getKey()))) {`
`60`	`60`	`continue;`
`61`	`61`	`}`
`62`	`62`