Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51095

Don't trigger a NullPointerException when the SSL handshake fails with the HTTP-APR connector.
Patch provided by Mike Glazer.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1096244 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 6f4cb65..e26a938 100644 (file)
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -1681,6 +1681,7 @@ public class AprEndpoint extends AbstractEndpoint {
                         // Close socket and pool
                         destroySocket(socket.getSocket().longValue());
                         socket = null;
+                        return;
                     }
                     // Process the request from this socket
                     Handler.SocketState state = handler.process(socket);

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 28548fa..c1a5647 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -120,6 +120,11 @@
         calculating connection and keep-alive timeouts for the HTTP BIO
         connector. (markt)
       </fix>
+      <fix>
+        <bug>51095</bug>: Don&apos;t trigger a NullPointerException when the SSL
+        handshake fails with the HTTP-APR connector. Patch provided by Mike
+        Glazer. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">