svn commit: r1709551 - in /tomcat/trunk/java/org/apache/coyote: AbstractProcessor.java ajp/AjpProcessor.java http11/Http11Processor.java

[markt]

Author: markt
Date: Tue Oct 20 09:02:42 2015
New Revision: 1709551

URL: http://svn.apache.org/viewvc?rev=1709551&view=rev
Log:
Refactoring

Modified:
    tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
    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/AbstractProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1709551&r1=1709550&r2=1709551&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Tue Oct 20 
09:02:42 2015
@@ -101,11 +101,6 @@ public abstract class AbstractProcessor
     }
 
 
-    protected void resetErrorState() {
-        errorState = ErrorState.NONE;
-    }
-
-
     protected ErrorState getErrorState() {
         return errorState;
     }
@@ -246,6 +241,14 @@ public abstract class AbstractProcessor
         asyncStateMachine.asyncOperation();
     }
 
+
+    @Override
+    public void recycle() {
+        errorState = ErrorState.NONE;
+        asyncStateMachine.recycle();
+    }
+
+
     /**
      * Flush any pending writes. Used during non-blocking writes to flush any
      * remaining data from a previous incomplete write.

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=1709551&r1=1709550&r2=1709551&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Oct 20 
09:02:42 2015
@@ -822,7 +822,7 @@ public class AjpProcessor extends Abstra
     @Override
     public void recycle() {
         getAdapter().checkRecycled(request, response);
-        asyncStateMachine.recycle();
+        super.recycle();
         request.recycle();
         response.recycle();
         first = true;
@@ -834,7 +834,6 @@ public class AjpProcessor extends Abstra
         certificates.recycle();
         swallowResponse = false;
         bytesWritten = 0;
-        resetErrorState();
     }
 
 

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=1709551&r1=1709550&r2=1709551&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Oct 20 
09:02:42 2015
@@ -1794,13 +1794,12 @@ public class Http11Processor extends Abs
     @Override
     public final void recycle() {
         getAdapter().checkRecycled(request, response);
-        asyncStateMachine.recycle();
+        super.recycle();
         inputBuffer.recycle();
         outputBuffer.recycle();
         httpUpgradeHandler = null;
         socketWrapper = null;
         sendfileData = null;
-        resetErrorState();
     }
 
 
@@ -1814,5 +1813,4 @@ public class Http11Processor extends Abs
     public void pause() {
         // NOOP for HTTP
     }
-
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org