Author: markt
Date: Tue Sep 14 11:47:57 2010
New Revision: 996852
URL: http://svn.apache.org/viewvc?rev=996852&view=rev
Log:
More re-factoring prior to large async changes
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=996852&r1=996851&r2=996852&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Tue
Sep 14 11:47:57 2010
@@ -1081,4 +1081,12 @@ public abstract class AbstractHttp11Proc
}
}
+
+ public final void recycle() {
+ getInputBuffer().recycle();
+ getOutputBuffer().recycle();
+ recycleInternal();
+ }
+
+ protected abstract void recycleInternal();
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=996852&r1=996851&r2=996852&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Tue Sep
14 11:47:57 2010
@@ -391,10 +391,9 @@ public class Http11AprProcessor extends
}
-
- public void recycle() {
- inputBuffer.recycle();
- outputBuffer.recycle();
+
+ @Override
+ public void recycleInternal() {
this.socket = 0;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=996852&r1=996851&r2=996852&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Tue Sep
14 11:47:57 2010
@@ -465,9 +465,8 @@ public class Http11NioProcessor extends
}
- public void recycle() {
- inputBuffer.recycle();
- outputBuffer.recycle();
+ @Override
+ public void recycleInternal() {
this.socket = null;
this.cometClose = false;
this.comet = false;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=996852&r1=996851&r2=996852&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Sep 14
11:47:57 2010
@@ -361,10 +361,9 @@ public class Http11Processor extends Abs
}
- public void recycle() {
+ @Override
+ protected void recycleInternal() {
// Recycle
- inputBuffer.recycle();
- outputBuffer.recycle();
this.socket = null;
async = false;
// Recycle ssl info
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
