Author: markt
Date: Tue Sep 29 22:26:56 2015
New Revision: 1705944
URL: http://svn.apache.org/viewvc?rev=1705944&view=rev
Log:
More simplification
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1705944&r1=1705943&r2=1705944&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Sep 29
22:26:56 2015
@@ -825,18 +825,15 @@ public class AjpProcessor extends Abstra
@Override
public void recycle() {
getAdapter().checkRecycled(request, response);
-
asyncStateMachine.recycle();
-
- // Recycle Request object
+ request.recycle();
+ response.recycle();
first = true;
endOfStream = false;
waitingForBodyMessage = false;
empty = true;
replay = false;
finished = false;
- request.recycle();
- response.recycle();
certificates.recycle();
swallowResponse = false;
bytesWritten = 0;
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=1705944&r1=1705943&r2=1705944&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Sep 29
22:26:56 2015
@@ -80,13 +80,13 @@ public class Http11Processor extends Abs
/**
* Input.
*/
- protected Http11InputBuffer inputBuffer;
+ protected final Http11InputBuffer inputBuffer;
/**
* Output.
*/
- protected Http11OutputBuffer outputBuffer;
+ protected final Http11OutputBuffer outputBuffer;
/**
@@ -1830,20 +1830,13 @@ public class Http11Processor extends Abs
@Override
public final void recycle() {
getAdapter().checkRecycled(request, response);
-
- if (inputBuffer != null) {
- inputBuffer.recycle();
- }
- if (outputBuffer != null) {
- outputBuffer.recycle();
- }
- if (asyncStateMachine != null) {
- asyncStateMachine.recycle();
- }
+ asyncStateMachine.recycle();
+ inputBuffer.recycle();
+ outputBuffer.recycle();
httpUpgradeHandler = null;
- resetErrorState();
socketWrapper = null;
sendfileData = null;
+ resetErrorState();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
