tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1154897 - in /tomcat/trunk: java/org/apache/coyote/ajp/AjpNioProcessor.java webapps/docs/changelog.xml
Date Mon, 08 Aug 2011 09:57:05 GMT
Author: markt
Date: Mon Aug  8 09:57:05 2011
New Revision: 1154897

URL: http://svn.apache.org/viewvc?rev=1154897&view=rev
Log:
Correctly indicate if socket is closing when calling recycle for the AJP NIO processor. Note
since the flag is unused in this case there were no bugs triggered by the re-factoring error.
(rjung)

Modified:
    tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1154897&r1=1154896&r2=1154897&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Mon Aug  8 09:57:05 2011
@@ -128,14 +128,14 @@ public class AjpNioProcessor extends Abs
                     } catch (IOException e) {
                         error = true;
                     }
-                    recycle(true);
+                    recycle(false);
                     continue;
                 } else if(type != Constants.JK_AJP13_FORWARD_REQUEST) {
                     // Usually the servlet didn't read the previous request body
                     if(log.isDebugEnabled()) {
                         log.debug("Unexpected message: "+type);
                     }
-                    recycle(false);
+                    recycle(true);
                     continue;
                 }
                 request.setStartTime(System.currentTimeMillis());
@@ -217,7 +217,7 @@ public class AjpNioProcessor extends Abs
                 socket.setTimeout(keepAliveTimeout);
             }
 
-            recycle(true);
+            recycle(false);
         }
         
         rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1154897&r1=1154896&r2=1154897&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Aug  8 09:57:05 2011
@@ -179,6 +179,11 @@
         Set <code>reuse</code> flag of final AJP <code>END_RESPONSE</code>
         packet to <code>0</code> if we plan to close the connection. (rjung)
       </update>
+      <update>
+        Correctly indicate if socket is closing when calling recycle for the AJP
+        NIO processor. Note since the flag is unused in this case there were no
+        bugs triggered by the re-factoring error. (rjung)
+      </update>
     </changelog>
   </subsection>
   <subsection name="Jasper">



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


Mime
View raw message