[Jboss-svn-commits] JBL Code SVN: r1633 - trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11

[<jbo...@li...>]

Author: rem...@jb...
Date: 2005-11-23 11:15:04 -0500 (Wed, 23 Nov 2005)
New Revision: 1633

Modified:
   trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/Http11AprProcessor.java
Log:
- Do the same for SSL actions.

Modified: trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/Http11AprProcessor.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/Http11AprProcessor.java	2005-11-23 16:03:27 UTC (rev 1632)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/coyote/http11/Http11AprProcessor.java	2005-11-23 16:15:04 UTC (rev 1633)
@@ -1090,8 +1090,8 @@
 
         } else if (actionCode == ActionCode.ACTION_REQ_SSL_ATTRIBUTE ) {
 
-            try {
-                if (ssl) {
+            if (ssl && (socket != 0)) {
+                try {
                     // Cipher suite
                     Object sslO = SSLSocket.getInfoS(socket, SSL.SSL_INFO_CIPHER);
                     if (sslO != null) {
@@ -1127,14 +1127,14 @@
                         request.setAttribute
                             (AprEndpoint.SESSION_ID_KEY, sslO);
                     }
+                } catch (Exception e) {
+                    log.warn(sm.getString("http11processor.socket.ssl"), e);
                 }
-            } catch (Exception e) {
-                log.warn(sm.getString("http11processor.socket.ssl"), e);
             }
 
         } else if (actionCode == ActionCode.ACTION_REQ_SSL_CERTIFICATE) {
 
-            if (ssl) {
+            if (ssl && (socket != 0)) {
                  // Consume and buffer the request body, so that it does not
                  // interfere with the client's handshake messages
                 InputFilter[] inputFilters = inputBuffer.getFilters();