Author: markt
Date: Fri Aug 12 07:47:15 2016
New Revision: 1756102
URL: http://svn.apache.org/viewvc?rev=1756102&view=rev
Log:
Align ActionCode.NB_WRITE_INTEREST
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=1756102&r1=1756101&r2=1756102&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:15 2016
@@ -553,8 +553,7 @@ public class AjpProcessor extends Abstra
}
case NB_WRITE_INTEREST: {
AtomicBoolean isReady = (AtomicBoolean)param;
- boolean result = responseMsgPos == -1 &&
socketWrapper.isReadyForWrite();
- isReady.set(result);
+ isReady.set(isReady());
break;
}
case DISPATCH_READ: {
@@ -1517,6 +1516,11 @@ public class AjpProcessor extends Abstra
}
+ private boolean isReady() {
+ return responseMsgPos == -1 && socketWrapper.isReadyForWrite();
+ }
+
+
/**
* 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=1756102&r1=1756101&r2=1756102&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:15 2016
@@ -846,7 +846,7 @@ public class Http11Processor extends Abs
}
case NB_WRITE_INTEREST: {
AtomicBoolean isReady = (AtomicBoolean)param;
- isReady.set(outputBuffer.isReady());
+ isReady.set(isReady());
break;
}
case DISPATCH_READ: {
@@ -1842,6 +1842,11 @@ public class Http11Processor extends Abs
}
+ private boolean isReady() {
+ return outputBuffer.isReady();
+ }
+
+
/**
* 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=1756102&r1=1756101&r2=1756102&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:15 2016
@@ -300,7 +300,7 @@ public class StreamProcessor extends Abs
}
case NB_WRITE_INTEREST: {
AtomicBoolean result = (AtomicBoolean) param;
- result.set(stream.getOutputBuffer().isReady());
+ result.set(isReady());
break;
}
case DISPATCH_READ: {
@@ -454,6 +454,11 @@ public class StreamProcessor extends Abs
}
+ private boolean isReady() {
+ return stream.getOutputBuffer().isReady();
+ }
+
+
@Override
public void recycle() {
// StreamProcessor instances are not re-used.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
