consolidate methods into one

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

diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index f9212a9..8bb1ea9 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -950,14 +950,14 @@ public class Http11NioProcessor implements ActionHook {
 
 
             rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
-            if (!error && keepAlive && !comet) {
-                //we're at a keep alive stage,
-                openSocket = true;
-                //Add the socket to the poller
-                socket.getPoller().add(socket);
-                //free up the thread
-                break;
-            }
+//            if (!error && keepAlive && !comet) {
+//                //we're at a keep alive stage,
+//                openSocket = true;
+//                //Add the socket to the poller
+//                socket.getPoller().add(socket);
+//                //free up the thread
+//                break;
+//            }
         }
 
         rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index b26da8f..4eface4 100644 (file)
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1116,21 +1116,11 @@ public class NioEndpoint {
             workers.notify();
         }
     }
-    /**
-     * Process given socket.
-     */
-    protected boolean processSocket(NioChannel socket) {
-        return processSocket(socket,null);
-    }
 
 
     /**
      * Process given socket for an event.
      */
-    protected boolean processSocket(NioChannel socket, SocketStatus status) {
-        return processSocket(socket,status,true);
-    }
-    
     protected boolean processSocket(NioChannel socket, SocketStatus status, boolean dispatch) {
         try {
             if (executor == null) {
@@ -1504,8 +1494,8 @@ public class NioEndpoint {
                             //check if thread is available
                             if ( isWorkerAvailable() ) {
                                 unreg(sk, attachment);
-                                if (!processSocket(channel, SocketStatus.OPEN))
-                                    processSocket(channel, SocketStatus.DISCONNECT);
+                                if (!processSocket(channel, SocketStatus.OPEN,true))
+                                    processSocket(channel, SocketStatus.DISCONNECT,true);
                                 attachment.setFairness(0);
                             } else {
                                 //increase the fairness counter
@@ -1519,7 +1509,7 @@ public class NioEndpoint {
                             //later on, improve latch behavior
                             if ( isWorkerAvailable() ) {
                                 unreg(sk, attachment);
-                                boolean close = (!processSocket(channel));
+                                boolean close = (!processSocket(channel,null,true));
                                 if (close) {
                                     cancelledKey(sk,SocketStatus.DISCONNECT,false);
                                 }
@@ -1632,7 +1622,6 @@ public class NioEndpoint {
                     cancelledKey(key, SocketStatus.ERROR,false);
                 }
             }//for
-            if ( log.isDebugEnabled() ) log.debug("Poller processed "+keycount+" keys through timeout");
         }
     }
 
@@ -1922,6 +1911,8 @@ public class NioEndpoint {
                 } finally {
                     //dereference socket to let GC do its job
                     socket = null;
+                    this.socket = null;
+                    key = null;
                     // Finish up this request
                     recycleWorkerThread(this);
                 }