[ISSUE apache#4273] NettyRemotingClient get tls conf from system prop…

…erties
zhanxuefeng · Jun 9, 2022 · 4a0f258 · 4a0f258
1 parent 446b76b
commit 4a0f258
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java
@@ -129,7 +129,7 @@ public Thread newThread(Runnable r) {
             }
         });
 
-        if (nettyClientConfig.isUseTLS()) {
+        if (nettyClientConfig.isUseTLS() || TlsSystemConfig.tlsEnable) {
             try {
                 sslContext = TlsHelper.buildSslContext(true);
                 log.info("SSL enabled for client");
@@ -170,7 +170,7 @@ public Thread newThread(Runnable r) {
                 @Override
                 public void initChannel(SocketChannel ch) throws Exception {
                     ChannelPipeline pipeline = ch.pipeline();
-                    if (nettyClientConfig.isUseTLS()) {
+                    if (nettyClientConfig.isUseTLS() || TlsSystemConfig.tlsEnable) {
                         if (null != sslContext) {
                             pipeline.addFirst(defaultEventExecutorGroup, "sslHandler", sslContext.newHandler(ch.alloc()));
                             log.info("Prepend SSL handler");