Author: markt
Date: Fri Aug 12 07:45:44 2016
New Revision: 1756084
URL: http://svn.apache.org/viewvc?rev=1756084&view=rev
Log:
Align ActionCode.CLOSE
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.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=1756084&r1=1756083&r2=1756084&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:44 2016
@@ -234,7 +234,7 @@ public class AjpProcessor extends Abstra
/**
* Finished response.
*/
- private boolean finished = false;
+ private boolean responseFinished = false;
/**
@@ -371,7 +371,7 @@ public class AjpProcessor extends Abstra
case CLOSE: {
action(ActionCode.COMMIT, null);
try {
- finish();
+ finishResponse();
} catch (IOException e) {
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
}
@@ -795,10 +795,10 @@ public class AjpProcessor extends Abstra
}
// Finish the response if not done yet
- if (!finished && getErrorState().isIoAllowed()) {
+ if (!responseFinished && getErrorState().isIoAllowed()) {
try {
action(ActionCode.COMMIT, null);
- finish();
+ finishResponse();
} catch (IOException ioe){
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
} catch (Throwable t) {
@@ -856,7 +856,7 @@ public class AjpProcessor extends Abstra
waitingForBodyMessage = false;
empty = true;
replay = false;
- finished = false;
+ responseFinished = false;
certificates.recycle();
swallowResponse = false;
bytesWritten = 0;
@@ -1410,7 +1410,7 @@ public class AjpProcessor extends Abstra
// Calling code should ensure that there is no data in the buffers for
// non-blocking writes.
// TODO Validate the assertion above
- if (!finished) {
+ if (!responseFinished) {
if (ajpFlush) {
// Send the flush message
socketWrapper.write(true, flushMessageArray, 0,
flushMessageArray.length);
@@ -1423,11 +1423,11 @@ public class AjpProcessor extends Abstra
/**
* Finish AJP response.
*/
- private void finish() throws IOException {
- if (finished)
+ private void finishResponse() throws IOException {
+ if (responseFinished)
return;
- finished = true;
+ responseFinished = true;
// Swallow the unread body packet if present
if (waitingForBodyMessage || first && request.getContentLengthLong() >
0) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java?rev=1756084&r1=1756083&r2=1756084&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java Fri Aug
12 07:45:44 2016
@@ -62,7 +62,7 @@ public class Http11OutputBuffer implemen
/**
* Finished flag.
*/
- protected boolean finished;
+ protected boolean responseFinished;
/**
@@ -123,7 +123,7 @@ public class Http11OutputBuffer implemen
activeFilters = new OutputFilter[0];
lastActiveFilter = -1;
- finished = false;
+ responseFinished = false;
outputStreamOutputBuffer = new SocketOutputBuffer();
}
@@ -288,18 +288,18 @@ public class Http11OutputBuffer implemen
// Reset pointers
pos = 0;
lastActiveFilter = -1;
- finished = false;
+ responseFinished = false;
byteCount = 0;
}
/**
- * End request.
+ * Finish writing the response.
*
* @throws IOException an underlying I/O error occurred
*/
- public void endRequest() throws IOException {
- if (finished) {
+ public void finishResponse() throws IOException {
+ if (responseFinished) {
return;
}
@@ -309,7 +309,7 @@ public class Http11OutputBuffer implemen
flushBuffer(true);
- finished = true;
+ responseFinished = true;
}
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=1756084&r1=1756083&r2=1756084&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:44 2016
@@ -664,7 +664,7 @@ public class Http11Processor extends Abs
case CLOSE: {
action(ActionCode.COMMIT, null);
try {
- outputBuffer.endRequest();
+ finishResponse();
} catch (IOException e) {
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
}
@@ -721,7 +721,7 @@ public class Http11Processor extends Abs
}
case CLOSE_NOW: {
// Block further output
- outputBuffer.finished = true;
+ outputBuffer.responseFinished = true;
setErrorState(ErrorState.CLOSE_NOW, null);
break;
}
@@ -948,7 +948,7 @@ public class Http11Processor extends Abs
case UPGRADE: {
upgradeToken = (UpgradeToken) param;
// Stop further HTTP output
- outputBuffer.finished = true;
+ outputBuffer.responseFinished = true;
break;
}
@@ -1785,7 +1785,7 @@ public class Http11Processor extends Abs
if (getErrorState().isIoAllowed()) {
try {
action(ActionCode.COMMIT, null);
- outputBuffer.endRequest();
+ outputBuffer.finishResponse();
} catch (IOException e) {
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
} catch (Throwable t) {
@@ -1797,6 +1797,11 @@ public class Http11Processor extends Abs
}
+ private void finishResponse() throws IOException {
+ outputBuffer.finishResponse();
+ }
+
+
/**
* 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=1756084&r1=1756083&r2=1756084&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:44 2016
@@ -118,7 +118,7 @@ public class StreamProcessor extends Abs
case CLOSE: {
action(ActionCode.COMMIT, null);
try {
- stream.getOutputBuffer().close();
+ finishResponse();
} catch (IOException ioe) {
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
}
@@ -385,6 +385,11 @@ public class StreamProcessor extends Abs
}
+ private void finishResponse() throws IOException {
+ stream.getOutputBuffer().close();
+ }
+
+
@Override
public void recycle() {
// StreamProcessor instances are not re-used.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
