Author: markt
Date: Fri Aug 12 07:45:55 2016
New Revision: 1756086
URL: http://svn.apache.org/viewvc?rev=1756086&view=rev
Log:
Align ActionCode.CLIENT_FLUSH
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.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=1756086&r1=1756085&r2=1756086&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Fri Aug 12
07:45:55 2016
@@ -387,6 +387,7 @@ public class AjpProcessor extends Abstra
flush();
} catch (IOException e) {
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
+ response.setErrorException(e);
}
break;
}
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=1756086&r1=1756085&r2=1756086&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Fri Aug 12
07:45:55 2016
@@ -677,7 +677,7 @@ public class Http11Processor extends Abs
case CLIENT_FLUSH: {
action(ActionCode.COMMIT, null);
try {
- outputBuffer.flush();
+ flush();
} catch (IOException e) {
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
response.setErrorException(e);
@@ -1807,6 +1807,11 @@ public class Http11Processor extends Abs
}
+ private void flush() throws IOException {
+ outputBuffer.flush();
+ }
+
+
/**
* Checks to see if the keep-alive loop should be broken, performing any
* processing (e.g. sendfile handling) that may have an impact on whether
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1756086&r1=1756085&r2=1756086&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Fri Aug 12
07:45:55 2016
@@ -131,7 +131,7 @@ public class StreamProcessor extends Abs
case CLIENT_FLUSH: {
action(ActionCode.COMMIT, null);
try {
- stream.flushData();
+ flush();
} catch (IOException ioe) {
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
response.setErrorException(ioe);
@@ -395,6 +395,11 @@ public class StreamProcessor extends Abs
}
+ private void flush() throws IOException {
+ stream.flushData();
+ }
+
+
@Override
public void recycle() {
// StreamProcessor instances are not re-used.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
