You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ji...@apache.org on 2022/07/13 07:46:40 UTC
[rocketmq] branch 4.9.x updated (35ce9ad4d -> c88686f13)
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a change to branch 4.9.x
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
from 35ce9ad4d Merge pull request #4574 from gap1994/develop
new 0b2cbf963 Upgrade dledger version to 0.2.7 (#4577)
new bcbf34f40 Fix compare different types (#4580)
new c88686f13 fix Namesrv auto discovery not work
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java | 2 +-
broker/src/main/java/org/apache/rocketmq/broker/out/BrokerOuterAPI.java | 2 +-
.../src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java | 2 +-
pom.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
[rocketmq] 01/03: Upgrade dledger version to 0.2.7 (#4577)
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch 4.9.x
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 0b2cbf9632938e7654cfdeb5a5d510400bc41883
Author: rongtong <ji...@163.com>
AuthorDate: Mon Jul 11 09:47:09 2022 +0800
Upgrade dledger version to 0.2.7 (#4577)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b7b7a50e6..f67ae7a00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
<lz4-java.version>1.8.0</lz4-java.version>
<opentracing.version>0.33.0</opentracing.version>
<jaeger.version>1.6.0</jaeger.version>
- <dleger.version>0.2.6</dleger.version>
+ <dleger.version>0.2.7</dleger.version>
<annotations-api.version>6.0.53</annotations-api.version>
<extra-enforcer-rules.version>1.0-beta-4</extra-enforcer-rules.version>
[rocketmq] 03/03: fix Namesrv auto discovery not work
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch 4.9.x
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit c88686f13e6f4acef1f00c6d3e18589683ec3368
Author: tigerweili <ti...@tencent.com>
AuthorDate: Thu Jun 23 11:49:47 2022 +0800
fix Namesrv auto discovery not work
---
broker/src/main/java/org/apache/rocketmq/broker/out/BrokerOuterAPI.java | 2 +-
.../src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/out/BrokerOuterAPI.java b/broker/src/main/java/org/apache/rocketmq/broker/out/BrokerOuterAPI.java
index c5b53a777..df9b86649 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/out/BrokerOuterAPI.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/out/BrokerOuterAPI.java
@@ -86,7 +86,7 @@ public class BrokerOuterAPI {
public String fetchNameServerAddr() {
try {
String addrs = this.topAddressing.fetchNSAddr();
- if (addrs != null) {
+ if (addrs != null && !UtilAll.isBlank(addrs)) {
if (!addrs.equals(this.nameSrvAddr)) {
log.info("name server address changed, old: {} new: {}", this.nameSrvAddr, addrs);
this.updateNameServerAddressList(addrs);
diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
index 5d7e1685e..bec1a5684 100644
--- a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
+++ b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
@@ -227,7 +227,7 @@ public class MQClientAPIImpl {
public String fetchNameServerAddr() {
try {
String addrs = this.topAddressing.fetchNSAddr();
- if (addrs != null) {
+ if (addrs != null && !UtilAll.isBlank(addrs)) {
if (!addrs.equals(this.nameSrvAddr)) {
log.info("name server address changed, old=" + this.nameSrvAddr + ", new=" + addrs);
this.updateNameServerAddressList(addrs);
[rocketmq] 02/03: Fix compare different types (#4580)
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch 4.9.x
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit bcbf34f40007244e23385c6d35c397e1e582e102
Author: Oliver <wq...@163.com>
AuthorDate: Tue Jul 12 13:54:27 2022 +0800
Fix compare different types (#4580)
---
.../main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
index 9b64e4cdc..fc8fd0959 100644
--- a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
+++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
@@ -344,7 +344,7 @@ public class PlainPermissionManager {
accountMap.put(plainAccessConfig.getAccessKey(), buildPlainAccessResource(plainAccessConfig));
} else {
for (Map.Entry<String, PlainAccessResource> entry : accountMap.entrySet()) {
- if (entry.getValue().equals(plainAccessConfig.getAccessKey())) {
+ if (entry.getValue().getAccessKey().equals(plainAccessConfig.getAccessKey())) {
PlainAccessResource plainAccessResource = buildPlainAccessResource(plainAccessConfig);
accountMap.put(entry.getKey(), plainAccessResource);
break;