Reset sendfile data in recycle method so prepareRequest can be pulled up

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

diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index 49a90a6..5506e5f 100644 (file)
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -390,7 +390,8 @@ public class Http11AprProcessor extends AbstractHttp11Processor {
 
     @Override
     public void recycleInternal() {
-        this.socket = null;
+        socket = null;
+        sendfileData = null;
     }
     
 
@@ -636,7 +637,6 @@ public class Http11AprProcessor extends AbstractHttp11Processor {
         http09 = false;
         contentDelimitation = false;
         expectation = false;
-        sendfileData = null;
         if (endpoint.isSSLEnabled()) {
             request.scheme().setString("https");
         }

diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index bb1fb2f..b14758c 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -447,15 +447,16 @@ public class Http11NioProcessor extends AbstractHttp11Processor {
 
     @Override
     public void recycleInternal() {
-        this.socket = null;
-        this.cometClose = false;
-        this.comet = false;
+        socket = null;
+        cometClose = false;
+        comet = false;
         remoteAddr = null;
         remoteHost = null;
         localAddr = null;
         localName = null;
         remotePort = -1;
         localPort = -1;
+        sendfileData = null;
     }
 
 
@@ -680,7 +681,6 @@ public class Http11NioProcessor extends AbstractHttp11Processor {
         http09 = false;
         contentDelimitation = false;
         expectation = false;
-        sendfileData = null;
         if (endpoint.isSSLEnabled()) {
             request.scheme().setString("https");
         }