svn commit: r1137372 - /tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java

[rjung]

Author: rjung
Date: Sun Jun 19 14:27:52 2011
New Revision: 1137372

URL: http://svn.apache.org/viewvc?rev=1137372&view=rev
Log:
No need to for addToPoller in APR HTTP.

When returning SocketState.OPEN the socket is
always added to the poller.

Fixes some crashes due to putting the same socket
twice in the poller.

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1137372&r1=1137371&r2=1137372&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Sun Jun 
19 14:27:52 2011
@@ -212,7 +212,6 @@ public class Http11AprProcessor extends 
         
         boolean keptAlive = false;
         boolean openSocket = false;
-        boolean addToPoller = false;
 
         while (!error && keepAlive && !comet && !isAsync() && 
!endpoint.isPaused()) {
 
@@ -232,7 +231,6 @@ public class Http11AprProcessor extends 
                         adapter.log(request, response, 0);
                         error = true;
                     } else {
-                        addToPoller = true;
                         break;
                     }
                 }
@@ -350,10 +348,6 @@ public class Http11AprProcessor extends 
         } else if (comet  || isAsync()) {
             return SocketState.LONG;
         } else {
-            // Add the socket to the poller
-            if (addToPoller) {
-                ((AprEndpoint)endpoint).getPoller().add(socketRef);
-            }
             return (openSocket) ? SocketState.OPEN : SocketState.CLOSED;
         }
         



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