diff --git a/VERSION b/VERSION
index a194c18e8..5e3ec53ea 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.5.1
+6.5.2
diff --git a/client/all/pom.xml b/client/all/pom.xml
index 13f069eee..07c49f140 100644
--- a/client/all/pom.xml
+++ b/client/all/pom.xml
@@ -6,7 +6,7 @@
com.alipay.sofa
registry-client-all
- 6.5.1
+ 6.5.2
${project.groupId}:${project.artifactId}
http://github.com/alipay/sofa-registry
diff --git a/client/api/pom.xml b/client/api/pom.xml
index 095f6ec4a..48f948ff3 100644
--- a/client/api/pom.xml
+++ b/client/api/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-client-parent
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/client/impl/pom.xml b/client/impl/pom.xml
index a8adff1b2..ec71d69cb 100644
--- a/client/impl/pom.xml
+++ b/client/impl/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-client-parent
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/client/log/pom.xml b/client/log/pom.xml
index abc15d408..6a2563f9a 100644
--- a/client/log/pom.xml
+++ b/client/log/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-client-parent
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/client/pom.xml b/client/pom.xml
index 017d3e42b..241e1d351 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -7,7 +7,7 @@
com.alipay.sofa
registry-parent
- 6.5.1
+ 6.5.2
../pom.xml
diff --git a/core/pom.xml b/core/pom.xml
index e603a981d..c4f65095c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-parent
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/pom.xml b/pom.xml
index eb80ead87..388592409 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
4.0.0
com.alipay.sofa
registry-parent
- 6.5.1
+ 6.5.2
pom
diff --git a/server/common/model/pom.xml b/server/common/model/pom.xml
index 70b62ae39..fbecc5aee 100644
--- a/server/common/model/pom.xml
+++ b/server/common/model/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-common
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
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
index b7f8f1f28..01b3ea07b 100644
--- 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 getDatumSummary(
for (Map.Entry> 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
index 54db0b5d3..03f1a102a 100644
--- 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 versionMap = Maps.newHashMapWithExpectedSize(publisherMap.size());
for (Map.Entry 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/model/src/main/java/com/alipay/sofa/registry/common/model/slot/DataSlotDiffUtils.java b/server/common/model/src/main/java/com/alipay/sofa/registry/common/model/slot/DataSlotDiffUtils.java
index 79f16ccfd..201390fc6 100644
--- a/server/common/model/src/main/java/com/alipay/sofa/registry/common/model/slot/DataSlotDiffUtils.java
+++ b/server/common/model/src/main/java/com/alipay/sofa/registry/common/model/slot/DataSlotDiffUtils.java
@@ -105,7 +105,7 @@ public static DataSlotDiffPublisherResult diffPublishersResult(
for (Map.Entry p : publisherMap.entrySet()) {
// filter publishers
- if (!acceptorManager.accept(
+ if (acceptorManager != null && !acceptorManager.accept(
SyncAcceptorRequest.buildRequest(dataInfoId, p.getValue().getPublishSource()))) {
continue;
}
diff --git a/server/common/pom.xml b/server/common/pom.xml
index 7f4b2b223..6d1b6b932 100644
--- a/server/common/pom.xml
+++ b/server/common/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-server-parent
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/server/common/util/pom.xml b/server/common/util/pom.xml
index 1bc605861..d947c0a66 100644
--- a/server/common/util/pom.xml
+++ b/server/common/util/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-common
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/server/distribution/all/pom.xml b/server/distribution/all/pom.xml
index c7752134d..8e8a08796 100644
--- a/server/distribution/all/pom.xml
+++ b/server/distribution/all/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-distribution
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/server/distribution/pom.xml b/server/distribution/pom.xml
index 04fa6c0e4..56963f7ff 100644
--- a/server/distribution/pom.xml
+++ b/server/distribution/pom.xml
@@ -6,7 +6,7 @@
com.alipay.sofa
registry-server-parent
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/server/pom.xml b/server/pom.xml
index 0430287e4..5b0a811e5 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -7,7 +7,7 @@
com.alipay.sofa
registry-parent
- 6.5.1
+ 6.5.2
../pom.xml
diff --git a/server/remoting/api/pom.xml b/server/remoting/api/pom.xml
index 1e50e6cfe..34a856512 100644
--- a/server/remoting/api/pom.xml
+++ b/server/remoting/api/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-remoting
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/server/remoting/bolt/pom.xml b/server/remoting/bolt/pom.xml
index 052a84abd..dc8621e44 100644
--- a/server/remoting/bolt/pom.xml
+++ b/server/remoting/bolt/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-remoting
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/server/remoting/http/pom.xml b/server/remoting/http/pom.xml
index ef3b0b985..a32e29da4 100644
--- a/server/remoting/http/pom.xml
+++ b/server/remoting/http/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-remoting
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/server/remoting/pom.xml b/server/remoting/pom.xml
index a0087f215..96a06d4be 100644
--- a/server/remoting/pom.xml
+++ b/server/remoting/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-server-parent
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/server/server/data/pom.xml b/server/server/data/pom.xml
index 1a74cd232..27f84c0bb 100644
--- a/server/server/data/pom.xml
+++ b/server/server/data/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-server
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/server/server/integration/pom.xml b/server/server/integration/pom.xml
index 3942c391e..8eb11a1b0 100644
--- a/server/server/integration/pom.xml
+++ b/server/server/integration/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-server
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/server/server/meta/pom.xml b/server/server/meta/pom.xml
index 6aa0815a7..ca9b86146 100644
--- a/server/server/meta/pom.xml
+++ b/server/server/meta/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-server
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/server/server/pom.xml b/server/server/pom.xml
index 58c859097..202939915 100644
--- a/server/server/pom.xml
+++ b/server/server/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-server-parent
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/server/server/session/pom.xml b/server/server/session/pom.xml
index 9c7195071..fac04a8e4 100644
--- a/server/server/session/pom.xml
+++ b/server/server/session/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-server
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/server/server/shared/pom.xml b/server/server/shared/pom.xml
index 9debc42e0..db11e2a31 100644
--- a/server/server/shared/pom.xml
+++ b/server/server/shared/pom.xml
@@ -5,7 +5,7 @@
registry-server
com.alipay.sofa
- 6.5.1
+ 6.5.2
4.0.0
diff --git a/server/store/api/pom.xml b/server/store/api/pom.xml
index 525e29879..aac319105 100644
--- a/server/store/api/pom.xml
+++ b/server/store/api/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-store
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/server/store/jdbc/pom.xml b/server/store/jdbc/pom.xml
index 9c938c781..68dda9b33 100644
--- a/server/store/jdbc/pom.xml
+++ b/server/store/jdbc/pom.xml
@@ -6,7 +6,7 @@
com.alipay.sofa
registry-store
- 6.5.1
+ 6.5.2
../pom.xml
diff --git a/server/store/jraft/pom.xml b/server/store/jraft/pom.xml
index 7db147208..63a7b8fc1 100644
--- a/server/store/jraft/pom.xml
+++ b/server/store/jraft/pom.xml
@@ -6,7 +6,7 @@
com.alipay.sofa
registry-store
- 6.5.1
+ 6.5.2
../pom.xml
diff --git a/server/store/pom.xml b/server/store/pom.xml
index 8a1e076a8..6fafd35ce 100644
--- a/server/store/pom.xml
+++ b/server/store/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-server-parent
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0
diff --git a/test/pom.xml b/test/pom.xml
index 18c76c50b..60df43d19 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -5,7 +5,7 @@
com.alipay.sofa
registry-parent
- 6.5.1
+ 6.5.2
../pom.xml
4.0.0