QPIDJMS-611: better accommodate use with Netty 4.2.x

Author: gemmellr

qpid-jms-client/pom.xml

@@ -170,10 +170,10 @@
             <Export-Package>org.apache.qpid.jms.*</Export-Package>
             <Import-Package>
             io.opentracing.*;resolution:="optional",
-            io.netty.channel.epoll;resolution:="optional";version="[4.1.0,4.2.0)",
-            io.netty.channel.kqueue;resolution:="optional";version="[4.1.0,4.2.0)",
-            io.netty.handler.proxy;resolution:="optional";version="[4.1.0,4.2.0)",
-            io.netty.*;version="[4.1.0,4.2.0)",
+            io.netty.channel.epoll;resolution:="optional";version="[4.1.0,4.3.0)",
+            io.netty.channel.kqueue;resolution:="optional";version="[4.1.0,4.3.0)",
+            io.netty.handler.proxy;resolution:="optional";version="[4.1.0,4.3.0)",
+            io.netty.*;version="[4.1.0,4.3.0)",
             org.apache.qpid.proton.*;version="[0.33.2,0.40.0)",
             *</Import-Package>
             <Dynamic-ImportPackage>*</Dynamic-ImportPackage>

qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportSupport.java

@@ -179,15 +179,7 @@ public static SSLEngine createJdkSslEngine(URI remote, SSLContext context, Trans
             engine = context.createSSLEngine(remote.getHost(), remote.getPort());
         }
 
-        engine.setEnabledProtocols(buildEnabledProtocols(engine, options));
-        engine.setEnabledCipherSuites(buildEnabledCipherSuites(engine, options));
-        engine.setUseClientMode(true);
-
-        if (options.isVerifyHost()) {
-            SSLParameters sslParameters = engine.getSSLParameters();
-            sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
-            engine.setSSLParameters(sslParameters);
-        }
+        configureSslEngine(options, engine);
 
         return engine;
     }
@@ -262,21 +254,27 @@ public static SSLEngine createOpenSslEngine(ByteBufAllocator allocator, URI remo
             engine = context.newEngine(allocator, remote.getHost(), remote.getPort());
         }
 
+        configureSslEngine(options, engine);
+
+        return engine;
+    }
+
+    //----- Internal support methods -----------------------------------------//
+
+    private static void configureSslEngine(TransportOptions options, SSLEngine engine) {
         engine.setEnabledProtocols(buildEnabledProtocols(engine, options));
         engine.setEnabledCipherSuites(buildEnabledCipherSuites(engine, options));
         engine.setUseClientMode(true);
 
+        final SSLParameters sslParameters = engine.getSSLParameters();
         if (options.isVerifyHost()) {
-            SSLParameters sslParameters = engine.getSSLParameters();
             sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
-            engine.setSSLParameters(sslParameters);
+        } else {
+            sslParameters.setEndpointIdentificationAlgorithm(null);
         }
-
-        return engine;
+        engine.setSSLParameters(sslParameters);
     }
 
-    //----- Internal support methods -----------------------------------------//
-
     private static String[] buildEnabledProtocols(SSLEngine engine, TransportOptions options) {
         List<String> enabledProtocols = new ArrayList<String>();
 

qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpTransportTest.java

@@ -343,7 +343,8 @@ public void testDetectServerClose() throws Exception {
 
             assertTrue(transport.isConnected());
 
-            server.close();
+            // Ensure client connects and event handlers triggered.
+            Wait.waitFor(() -> server.getChannelActiveCount() > 0, 10000, 50);
         }
 
         final Transport connectedTransport = transport;