Author: markt
Date: Tue Sep 29 21:19:36 2015
New Revision: 1705927
URL: http://svn.apache.org/viewvc?rev=1705927&view=rev
Log:
Align code
Modified:
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/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1705927&r1=1705926&r2=1705927&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Sep 29
21:19:36 2015
@@ -1698,9 +1698,8 @@ public class Http11Processor extends Abs
public SocketState dispatch(SocketStatus status) {
if (status == SocketStatus.OPEN_WRITE && response.getWriteListener()
!= null) {
+ asyncStateMachine.asyncOperation();
try {
- asyncStateMachine.asyncOperation();
-
if (outputBuffer.hasDataToWrite()) {
if (outputBuffer.flushBuffer(false)) {
// The buffer wasn't fully flushed so re-register the
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=1705927&r1=1705926&r2=1705927&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Tue Sep 29
21:19:36 2015
@@ -407,8 +407,8 @@ public class StreamProcessor extends Abs
stream.getIdentifier(), status));
}
if (status == SocketStatus.OPEN_WRITE && response.getWriteListener()
!= null) {
+ asyncStateMachine.asyncOperation();
try {
- asyncStateMachine.asyncOperation();
if (stream.getOutputBuffer().flush(false)) {
// The buffer wasn't fully flushed so re-register the
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
