Author: markt
Date: Fri Sep 11 16:44:35 2015
New Revision: 1702515

URL: http://svn.apache.org/r1702515
Log:
Update comment

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1702515&r1=1702514&r2=1702515&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Fri Sep 
11 16:44:35 2015
@@ -178,17 +178,20 @@ public class SecureNio2Channel extends N
     }
 
     /**
-     * Performs SSL handshake, non blocking, but performs NEED_TASK on the 
same thread.<br>
-     * Hence, you should never call this method using your Acceptor thread, as 
you would slow down
-     * your system significantly.<br>
-     * The return for this operation is 0 if the handshake is complete and a 
positive value if it is not complete.
-     * In the event of a positive value coming back, reregister the selection 
key for the return values interestOps.
+     * Performs SSL handshake, non blocking, but performs NEED_TASK on the same
+     * thread. Hence, you should never call this method using your Acceptor
+     * thread, as you would slow down your system significantly.
+     * <p>
+     * The return for this operation is 0 if the handshake is complete and a
+     * positive value if it is not complete. In the event of a positive value
+     * coming back, the appropriate read/write will already have been called
+     * with an appropriate CompletionHandler.
      *
-     * @return int - 0 if hand shake is complete, otherwise it returns a 
SelectionKey interestOps value
-     * @throws IOException If an I/O error occurs during the handshake or if 
the
-     *                     handshake fails during wrapping or unwrapping
-     */
-    @Override
+     * @return 0 if hand shake is complete, negative if the socket needs to
+     *         close and positive if the handshake is incomplete
+     *
+     * @throws IOException if an error occurs during the handshake
+     */    @Override
     public int handshake() throws IOException {
         return handshakeInternal(true);
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to