Merge branch 'apache:develop' into develop

ChineseTony · Mar 14, 2024 · 63ae502 · 63ae502
2 parents 9d8fffd + 3c27bfe
commit 63ae502
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/common/src/main/java/org/apache/rocketmq/common/namesrv/DefaultTopAddressing.java b/common/src/main/java/org/apache/rocketmq/common/namesrv/DefaultTopAddressing.java
@@ -107,27 +107,27 @@ public void registerChangeCallBack(NameServerUpdateCallback changeCallBack) {
     }
 
     public final String fetchNSAddr(boolean verbose, long timeoutMills) {
-        String url = this.wsAddr;
+        StringBuilder url = new StringBuilder(this.wsAddr);
         try {
             if (null != para && para.size() > 0) {
                 if (!UtilAll.isBlank(this.unitName)) {
-                    url = url + "-" + this.unitName + "?nofix=1&";
+                    url.append("-").append(this.unitName).append("?nofix=1&");
                 }
                 else {
-                    url = url + "?";
+                    url.append("?");
                 }
                 for (Map.Entry<String, String> entry : this.para.entrySet()) {
-                    url += entry.getKey() + "=" + entry.getValue() + "&";
+                    url.append(entry.getKey()).append("=").append(entry.getValue()).append("&");
                 }
-                url = url.substring(0, url.length() - 1);
+                url = new StringBuilder(url.substring(0, url.length() - 1));
             }
             else {
                 if (!UtilAll.isBlank(this.unitName)) {
-                    url = url + "-" + this.unitName + "?nofix=1";
+                    url.append("-").append(this.unitName).append("?nofix=1");
                 }
             }
 
-            HttpTinyClient.HttpResult result = HttpTinyClient.httpGet(url, null, null, "UTF-8", timeoutMills);
+            HttpTinyClient.HttpResult result = HttpTinyClient.httpGet(url.toString(), null, null, "UTF-8", timeoutMills);
             if (200 == result.code) {
                 String responseStr = result.content;
                 if (responseStr != null) {

diff --git a/docs/cn/RocketMQ_Example.md b/docs/cn/RocketMQ_Example.md
@@ -785,7 +785,7 @@ public class TransactionListenerImpl implements TransactionListener {
 3. 事务消息将在 Broker 配置文件中的参数 transactionTimeout 这样的特定时间长度之后被检查。当发送事务消息时，用户还可以通过设置用户属性 CHECK_IMMUNITY_TIME_IN_SECONDS 来改变这个限制，该参数优先于 `transactionTimeout` 参数。
 4. 事务性消息可能不止一次被检查或消费。
 5. 提交给用户的目标主题消息可能会失败，目前这依日志的记录而定。它的高可用性通过 RocketMQ 本身的高可用性机制来保证，如果希望确保事务消息不丢失、并且事务完整性得到保证，建议使用同步的双重写入机制。
-6. 事务消息的生产者 ID 不能与其他类型消息的生产者 ID 共享。与其他类型的消息不同，事务消息允许反向查询、MQ服务器能通过它们的生产者 ID 查询到消费者。
+6. 事务消息的生产者 GroupName 不能与其他类型消息的生产者 GroupName 共享。与其他类型的消息不同，事务消息允许反向查询、MQ服务器能通过它们的生产者 GroupName 查询到生产者。
 
 7 Logappender样例
 -----------------

diff --git a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
@@ -2926,7 +2926,7 @@ public void run() {
                 try {
                     TimeUnit.MILLISECONDS.sleep(1);
                     this.doReput();
-                } catch (Exception e) {
+                } catch (Throwable e) {
                     DefaultMessageStore.LOGGER.warn(this.getServiceName() + " service has exception. ", e);
                 }
             }