From c802924b2c0eb246ff75f585cb44480c83ae817c Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 7 Jul 2011 22:14:07 +0000
Subject: [PATCH] Pull up reset for remoteHost etc. to a common location

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1144077 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/coyote/http11/AbstractHttp11Processor.java | 6 ++++++
 java/org/apache/coyote/http11/Http11AprProcessor.java      | 8 --------
 java/org/apache/coyote/http11/Http11NioProcessor.java      | 6 ------
 java/org/apache/coyote/http11/Http11Processor.java         | 8 --------
 4 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
index 9f7818f56..5e56b5615 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11Processor.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
@@ -1281,6 +1281,12 @@ public abstract class AbstractHttp11Processor extends AbstractProcessor {
         getInputBuffer().recycle();
         getOutputBuffer().recycle();
         asyncStateMachine.recycle();
+        remoteAddr = null;
+        remoteHost = null;
+        localAddr = null;
+        localName = null;
+        remotePort = -1;
+        localPort = -1;
         recycleInternal();
     }
     
diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index fa87c0fc9..dd0a880fe 100644
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -173,14 +173,6 @@ public class Http11AprProcessor extends AbstractHttp11Processor {
         RequestInfo rp = request.getRequestProcessor();
         rp.setStage(org.apache.coyote.Constants.STAGE_PARSE);
 
-        // Set the remote address
-        remoteAddr = null;
-        remoteHost = null;
-        localAddr = null;
-        localName = null;
-        remotePort = -1;
-        localPort = -1;
-
         // Setting up the socket
         this.socket = socket;
         long socketRef = socket.getSocket().longValue();
diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index f9ef4eaea..4f3057005 100644
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -406,12 +406,6 @@ public class Http11NioProcessor extends AbstractHttp11Processor {
         socket = null;
         cometClose = false;
         comet = false;
-        remoteAddr = null;
-        remoteHost = null;
-        localAddr = null;
-        localName = null;
-        remotePort = -1;
-        localPort = -1;
         sendfileData = null;
     }
 
diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index 24a2a1a8a..5cc1e1866 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -134,14 +134,6 @@ public class Http11Processor extends AbstractHttp11Processor {
         RequestInfo rp = request.getRequestProcessor();
         rp.setStage(org.apache.coyote.Constants.STAGE_PARSE);
 
-        // Set the remote address
-        remoteAddr = null;
-        remoteHost = null;
-        localAddr = null;
-        localName = null;
-        remotePort = -1;
-        localPort = -1;
-
         // Setting up the I/O
         this.socket = socketWrapper;
         inputBuffer.setInputStream(socket.getSocket().getInputStream());
-- 
2.11.0