Add support for NIO2 connector in TestLargeClientHello

Author: dsoumis

java/org/apache/tomcat/util/net/SecureNio2Channel.java

@@ -590,6 +590,9 @@ protected SSLEngineResult handshakeUnwrap() throws IOException {
             // call unwrap
             getBufHandler().configureReadBufferForWrite();
             result = sslEngine.unwrap(netInBuffer, getBufHandler().getReadBuffer());
+            if (log.isDebugEnabled() && result.getStatus() == SSLEngineResult.Status.BUFFER_UNDERFLOW) {
+                log.debug(sm.getString("channel.nio.ssl.handshakeUnwrapBufferUnderflow"));
+            }
             /*
              * ByteBuffer.compact() is an optional method but netInBuffer is created from either ByteBuffer.allocate()
              * or ByteBuffer.allocateDirect() and the ByteBuffers returned by those methods do implement compact(). The

test/org/apache/tomcat/util/net/TestLargeClientHello.java

@@ -65,7 +65,10 @@ public void testLargeClientHelloWithSessionResumption() throws Exception {
 
         TesterSupport.initSsl(tomcat, keystoreFile.getAbsolutePath(), false);
 
-        try (LogCapture logCapture = attachLogCapture(Level.FINE, "org.apache.tomcat.util.net.SecureNioChannel")) {
+        try (LogCapture nioCapture = attachLogCapture(Level.FINE,
+            "org.apache.tomcat.util.net.SecureNioChannel");
+             LogCapture nio2Capture = attachLogCapture(Level.FINE,
+                 "org.apache.tomcat.util.net.SecureNio2Channel")) {
 
             tomcat.start();
 
@@ -77,8 +80,10 @@ public void testLargeClientHelloWithSessionResumption() throws Exception {
             Assert.assertTrue(getUrl(url).toString().contains("Hello World"));
             Assert.assertTrue(getUrl(url).toString().contains("Hello World"));
 
-            Assert.assertTrue(logCapture.containsText(
+            Assert.assertTrue(nioCapture.containsText(
                     TomcatBaseTest.getKeyFromPropertiesFile("org.apache.tomcat.util.net",
+                    "channel.nio.ssl.handshakeUnwrapBufferUnderflow")) || nio2Capture.containsText(
+                TomcatBaseTest.getKeyFromPropertiesFile("org.apache.tomcat.util.net",
                     "channel.nio.ssl.handshakeUnwrapBufferUnderflow")));
         }