activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [activemq-artemis] branch master updated: ARTEMIS-2248 don't create sslEngine w/sniHost in NettyConnector
Date Thu, 07 Feb 2019 15:05:00 GMT
This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new 98ca583  ARTEMIS-2248 don't create sslEngine w/sniHost in NettyConnector
     new 3f1a3ce  This closes #2539
98ca583 is described below

commit 98ca5833130788326518288289cb12037a784055
Author: Justin Bertram <jbertram@apache.org>
AuthorDate: Wed Feb 6 11:12:53 2019 -0600

    ARTEMIS-2248 don't create sslEngine w/sniHost in NettyConnector
---
 .../activemq/artemis/core/remoting/impl/netty/NettyConnector.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
index 3467f1b..fa0682e 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
@@ -649,8 +649,8 @@ public class NettyConnector extends AbstractConnector {
       SSLEngine engine = Subject.doAs(subject, new PrivilegedExceptionAction<SSLEngine>()
{
          @Override
          public SSLEngine run() {
-            if (verifyHost) {
-               return context.createSSLEngine(sniHost != null ? sniHost : host, port);
+            if (host != null && port != -1) {
+               return context.createSSLEngine(host, port);
             } else {
                return context.createSSLEngine();
             }
@@ -690,8 +690,8 @@ public class NettyConnector extends AbstractConnector {
       SSLEngine engine = Subject.doAs(subject, new PrivilegedExceptionAction<SSLEngine>()
{
          @Override
          public SSLEngine run() {
-            if (verifyHost) {
-               return context.newEngine(alloc, sniHost != null ? sniHost : host, port);
+            if (host != null && port != -1) {
+               return context.newEngine(alloc, host, port);
             } else {
                return context.newEngine(alloc);
             }


Mime
View raw message