You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by zh...@apache.org on 2022/12/09 11:54:06 UTC
[rocketmq] 25/26: [ISSUE #5485] Fix merge code issue
This is an automated email from the ASF dual-hosted git repository.
zhouxzhan pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 373c1bd13ef7148bc9d04db155bed77d98e00429
Author: zhouxiang <zh...@alibaba-inc.com>
AuthorDate: Fri Dec 9 10:23:23 2022 +0800
[ISSUE #5485] Fix merge code issue
---
proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java b/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java
index 4d5084cfd..9c833ba8a 100644
--- a/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java
+++ b/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java
@@ -1173,7 +1173,6 @@ public class ProxyConfig implements ConfigFile {
public void setChannelExpiredTimeout(long channelExpiredTimeout) {
this.channelExpiredTimeout = channelExpiredTimeout;
}
-}
public void setEnableRemotingLocalProxyGrpc(boolean enableRemotingLocalProxyGrpc) {
this.enableRemotingLocalProxyGrpc = enableRemotingLocalProxyGrpc;