From 046108a83909a428462e83ce61e87f0410f8ee38 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 19 Jun 2011 21:15:22 +0000
Subject: [PATCH] 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
---
 java/org/apache/coyote/http11/Http11AprProcessor.java | 4 ++--
 java/org/apache/coyote/http11/Http11NioProcessor.java | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index 49a90a620..5506e5f16 100644
--- 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 bb1fb2f8a..b14758cf6 100644
--- 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");
         }
-- 
2.11.0