Repository: activemq-artemis Updated Branches: refs/heads/master e2e5bdfec -> d5be6111e
ARTEMIS-1839 NettyConnector was ignoring sniHost This is fixing org.apache.activemq.artemis.tests.integration.ssl.CoreClientOverOneWaySSLKerb5Test#testOneWaySSLWithGoodClientCipherSuite Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c5b76bb3 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c5b76bb3 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c5b76bb3 Branch: refs/heads/master Commit: c5b76bb34c9b76611776f67052e13ebd7afb527e Parents: e2e5bdf Author: Clebert Suconic <[email protected]> Authored: Mon Apr 30 20:39:42 2018 -0400 Committer: Clebert Suconic <[email protected]> Committed: Mon Apr 30 20:39:44 2018 -0400 ---------------------------------------------------------------------- .../activemq/artemis/core/remoting/impl/netty/NettyConnector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c5b76bb3/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java ---------------------------------------------------------------------- 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 c946f9c..65a63e5 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 @@ -625,7 +625,7 @@ public class NettyConnector extends AbstractConnector { @Override public SSLEngine run() { if (verifyHost) { - return context.createSSLEngine(host, port); + return context.createSSLEngine(sniHost != null ? sniHost : host, port); } else { return context.createSSLEngine(); }
