Author: markt
Date: Fri Aug 12 07:47:05 2016
New Revision: 1756100
URL: http://svn.apache.org/viewvc?rev=1756100&view=rev
Log:
Align ActionCode.REQUEST_BODY_FULLY_READ
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=1756100&r1=1756099&r2=1756100&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:47:05 2016
@@ -542,7 +542,7 @@ public class AjpProcessor extends Abstra
// Servlet 3.1 non-blocking I/O
case REQUEST_BODY_FULLY_READ: {
AtomicBoolean result = (AtomicBoolean) param;
- result.set(endOfStream);
+ result.set(isRequestBodyFullyRead());
break;
}
case NB_READ_INTEREST: {
@@ -1507,6 +1507,11 @@ public class AjpProcessor extends Abstra
}
+ private boolean isRequestBodyFullyRead() {
+ return endOfStream;
+ }
+
+
/**
* Read at least the specified amount of bytes, and place them
* in the input buffer. Note that if any data is available to read then
this
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=1756100&r1=1756099&r2=1756100&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:47:05 2016
@@ -835,7 +835,7 @@ public class Http11Processor extends Abs
// Servlet 3.1 non-blocking I/O
case REQUEST_BODY_FULLY_READ: {
AtomicBoolean result = (AtomicBoolean) param;
- result.set(inputBuffer.isFinished());
+ result.set(isRequestBodyFullyRead());
break;
}
case NB_READ_INTEREST: {
@@ -1830,6 +1830,11 @@ public class Http11Processor extends Abs
}
+ private boolean isRequestBodyFullyRead() {
+ return inputBuffer.isFinished();
+ }
+
+
/**
* 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=1756100&r1=1756099&r2=1756100&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:47:05 2016
@@ -289,7 +289,7 @@ public class StreamProcessor extends Abs
// Servlet 3.1 non-blocking I/O
case REQUEST_BODY_FULLY_READ: {
AtomicBoolean result = (AtomicBoolean) param;
- result.set(stream.getInputBuffer().isRequestBodyFullyRead());
+ result.set(isRequestBodyFullyRead());
break;
}
case NB_READ_INTEREST: {
@@ -442,6 +442,11 @@ public class StreamProcessor extends Abs
}
+ private boolean isRequestBodyFullyRead() {
+ return stream.getInputBuffer().isRequestBodyFullyRead();
+ }
+
+
@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
