You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2018/11/13 20:23:07 UTC
svn commit: r1846545 - in /tomcat/trunk/java/org/apache/coyote:
AbstractProcessor.java ajp/AjpProcessor.java http11/Http11Processor.java
http2/Stream.java http2/StreamProcessor.java
Author: markt
Date: Tue Nov 13 20:23:07 2018
New Revision: 1846545
URL: http://svn.apache.org/viewvc?rev=1846545&view=rev
Log:
Rename for clarity / consistency
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
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/Stream.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1846545&r1=1846544&r2=1846545&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Tue Nov 13 20:23:07 2018
@@ -572,7 +572,7 @@ public abstract class AbstractProcessor
}
case NB_WRITE_INTEREST: {
AtomicBoolean isReady = (AtomicBoolean)param;
- isReady.set(isReady());
+ isReady.set(isReadyForWrite());
break;
}
case DISPATCH_READ: {
@@ -787,7 +787,7 @@ public abstract class AbstractProcessor
protected abstract void registerReadInterest();
- protected abstract boolean isReady();
+ protected abstract boolean isReadyForWrite();
protected void executeDispatches() {
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=1846545&r1=1846544&r2=1846545&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Nov 13 20:23:07 2018
@@ -1140,7 +1140,7 @@ public class AjpProcessor extends Abstra
@Override
- protected final boolean isReady() {
+ protected final boolean isReadyForWrite() {
return responseMsgPos == -1 && socketWrapper.isReadyForWrite();
}
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=1846545&r1=1846544&r2=1846545&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Nov 13 20:23:07 2018
@@ -1221,7 +1221,7 @@ public class Http11Processor extends Abs
@Override
- protected final boolean isReady() {
+ protected final boolean isReadyForWrite() {
return outputBuffer.isReady();
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1846545&r1=1846544&r2=1846545&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Tue Nov 13 20:23:07 2018
@@ -555,7 +555,7 @@ class Stream extends AbstractStream impl
}
- final boolean isReady() {
+ final boolean isReadyForWrite() {
return streamOutputBuffer.isReady();
}
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=1846545&r1=1846544&r2=1846545&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Tue Nov 13 20:23:07 2018
@@ -250,8 +250,8 @@ class StreamProcessor extends AbstractPr
@Override
- protected final boolean isReady() {
- return stream.isReady();
+ protected final boolean isReadyForWrite() {
+ return stream.isReadyForWrite();
}
@@ -373,7 +373,7 @@ class StreamProcessor extends AbstractPr
// has been emptied then the code below will call
// dispatch() which will enable the
// Response to respond to this event.
- if (stream.isReady()) {
+ if (stream.isReadyForWrite()) {
// Unexpected
throw new IllegalStateException();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1846545 - in /tomcat/trunk/java/org/apache/coyote:
AbstractProcessor.java ajp/AjpProcessor.java http11/Http11Processor.java
http2/Stream.java http2/StreamProcessor.java
Posted by Mark Thomas <ma...@apache.org>.
On 13/11/2018 20:23, markt@apache.org wrote:
> Author: markt
> Date: Tue Nov 13 20:23:07 2018
> New Revision: 1846545
>
> URL: http://svn.apache.org/viewvc?rev=1846545&view=rev
> Log:
> Rename for clarity / consistency
Just a heads up that this in preparation for a fix for bug 62899. I'm
going to need similar methods for read so I wanted clearly distinguish
between them.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org