Don't recycle the buffers at start of process() - this will break non-blocking reads...

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

diff --git a/java/org/apache/coyote/ajp/AjpNioProcessor.java b/java/org/apache/coyote/ajp/AjpNioProcessor.java
index b0514e3..c1b90c0 100644 (file)
--- a/java/org/apache/coyote/ajp/AjpNioProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpNioProcessor.java
@@ -116,7 +116,7 @@ public class AjpNioProcessor extends AbstractAjpProcessor {
      * Input buffer.
      */
     protected ByteBuffer readBuffer;
-    protected int readBufferEnd;
+    protected int readBufferEnd = 0;
     
     /**
      * Output buffer.
@@ -205,10 +205,7 @@ public class AjpNioProcessor extends AbstractAjpProcessor {
         // Setting up the socket
         this.socket = socket;
         readBuffer = socket.getBufHandler().getReadBuffer();
-        readBufferEnd = 0;
-        readBuffer.clear();
         writeBuffer = socket.getBufHandler().getWriteBuffer();
-        writeBuffer.clear();
         
         int soTimeout = -1;
         final KeyAttachment ka = (KeyAttachment)socket.getAttachment(false);
@@ -246,12 +243,14 @@ public class AjpNioProcessor extends AbstractAjpProcessor {
                     } catch (IOException e) {
                         error = true;
                     }
+                    recycle();
                     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();
                     continue;
                 }