[ARTEMIS-1043] Support IPv6 in NettyConnector Call IPV6Util.encloseHost when creating the uri used to send the HTTP ugrade request to ensure that IPv6 address are properly enclosed.
JIRA: https://issues.apache.org/jira/browse/ARTEMIS-1043 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a9730311 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a9730311 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a9730311 Branch: refs/heads/1.x Commit: a97303118bd963b67b1c6b9e20c74c991397d7cb Parents: f428f53 Author: Jeff Mesnil <[email protected]> Authored: Thu Apr 6 15:30:06 2017 +0200 Committer: Justin Bertram <[email protected]> Committed: Thu Apr 6 19:58:47 2017 -0500 ---------------------------------------------------------------------- .../activemq/artemis/core/remoting/impl/netty/NettyConnector.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a9730311/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 6211e8f..e1c7bd6 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 @@ -103,6 +103,7 @@ import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManager; import org.apache.activemq.artemis.spi.core.remoting.Connection; import org.apache.activemq.artemis.utils.ConfigurationHelper; import org.apache.activemq.artemis.utils.FutureLatch; +import org.apache.activemq.artemis.utils.IPV6Util; import org.jboss.logging.Logger; import static org.apache.activemq.artemis.utils.Base64.encodeBytes; @@ -658,7 +659,7 @@ public class NettyConnector extends AbstractConnector { if (sslEnabled) { scheme = "https"; } - URI uri = new URI(scheme, null, host, port, null, null, null); + URI uri = new URI(scheme, null, IPV6Util.encloseHost(host), port, null, null, null); HttpRequest request = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, uri.getRawPath()); request.headers().set(HttpHeaders.Names.HOST, host); request.headers().set(HttpHeaders.Names.UPGRADE, ACTIVEMQ_REMOTING);
