You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by yu...@apache.org on 2023/03/16 13:25:28 UTC
[rocketmq] branch develop updated: [ISSUE #6287] Fixed two redundant judgments (#6288)
This is an automated email from the ASF dual-hosted git repository.
yukon pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 10d17cfae [ISSUE #6287] Fixed two redundant judgments (#6288)
10d17cfae is described below
commit 10d17cfaee33fd80f726d8a378285a835e535f99
Author: Lobo Xu <31...@qq.com>
AuthorDate: Thu Mar 16 21:25:20 2023 +0800
[ISSUE #6287] Fixed two redundant judgments (#6288)
Co-authored-by: loboxu <lo...@tencent.com>
---
.../main/java/org/apache/rocketmq/proxy/grpc/GrpcServerBuilder.java | 5 ++---
.../java/org/apache/rocketmq/proxy/grpc/v2/common/GrpcConverter.java | 2 ++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/GrpcServerBuilder.java b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/GrpcServerBuilder.java
index 63c00221c..faffb6696 100644
--- a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/GrpcServerBuilder.java
+++ b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/GrpcServerBuilder.java
@@ -162,9 +162,8 @@ public class GrpcServerBuilder {
log.info("ServiceProvider loaded no AccessValidator, using default org.apache.rocketmq.acl.plain.PlainAccessValidator");
accessValidators.add(new PlainAccessValidator());
}
- if (!accessValidators.isEmpty()) {
- this.serverBuilder.intercept(new AuthenticationInterceptor(accessValidators));
- }
+
+ this.serverBuilder.intercept(new AuthenticationInterceptor(accessValidators));
this.serverBuilder
.intercept(new GlobalExceptionInterceptor())
diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/common/GrpcConverter.java b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/common/GrpcConverter.java
index a1fd88603..4daf83511 100644
--- a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/common/GrpcConverter.java
+++ b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/common/GrpcConverter.java
@@ -140,9 +140,11 @@ public class GrpcConverter {
// message_id
String uniqKey = messageExt.getProperty(MessageConst.PROPERTY_UNIQ_CLIENT_MESSAGE_ID_KEYIDX);
+
if (uniqKey == null) {
uniqKey = messageExt.getMsgId();
}
+
if (uniqKey != null) {
systemPropertiesBuilder.setMessageId(uniqKey);
}