Code clean-up.

Align BIO and NIO to make Async refactoring easier

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

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 6cb20ab..5d6d628 100644 (file)
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -52,6 +52,7 @@ import javax.net.ssl.X509KeyManager;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.IntrospectionUtils;
+import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
 import org.apache.tomcat.util.net.SecureNioChannel.ApplicationBufferHandler;
 import org.apache.tomcat.util.net.jsse.JSSESocketFactory;
 import org.apache.tomcat.util.net.jsse.NioX509KeyManager;
@@ -1478,11 +1479,11 @@ public class NioEndpoint extends AbstractEndpoint {
                     handshake = -1;
                 }
                 if ( handshake == 0 ) {
+                    SocketState state = SocketState.OPEN;
                     // Process the request from this socket
-                    boolean closed = (status==null)?(handler.process(socket)==Handler.SocketState.CLOSED) :
-                        (handler.event(socket,status)==Handler.SocketState.CLOSED);
+                    state = (status==null)?handler.process(socket):handler.event(socket,status);
 
-                    if (closed) {
+                    if (state == SocketState.CLOSED) {
                         // Close socket and pool
                         try {
                             KeyAttachment ka = null;