Author: markt
Date: Tue Apr 30 14:24:51 2013
New Revision: 1477657
URL: http://svn.apache.org/r1477657
Log:
Refactor canWrite -> isReady to align with changes made to Servlet spec
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java?rev=1477657&r1=1477656&r2=1477657&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java Tue
Apr 30 14:24:51 2013
@@ -111,7 +111,7 @@ public class CoyoteOutputStream
@Override
public boolean isReady() {
- return ob.canWrite();
+ return ob.isReady();
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1477657&r1=1477656&r2=1477657&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Tue Apr
30 14:24:51 2013
@@ -646,13 +646,13 @@ public class OutputBuffer extends Writer
}
- public boolean canWrite() {
+ public boolean isReady() {
if (coyoteResponse.getWriteListener() == null) {
throw new IllegalStateException("not in non blocking mode.");
}
- AtomicBoolean canWrite = new AtomicBoolean(true);
- coyoteResponse.action(ActionCode.NB_WRITE_INTEREST, canWrite);
- return canWrite.get();
+ AtomicBoolean isReady = new AtomicBoolean(true);
+ coyoteResponse.action(ActionCode.NB_WRITE_INTEREST, isReady);
+ return isReady.get();
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1477657&r1=1477656&r2=1477657&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Tue Apr
30 14:24:51 2013
@@ -614,11 +614,11 @@ public class Http11NioProcessor extends
if (socket==null || socket.getSocket().getAttachment(false)==null)
{
return;
}
- AtomicBoolean canWrite = (AtomicBoolean)param;
- if (outputBuffer.isWritable()) {
- canWrite.set(true);
+ AtomicBoolean isReady = (AtomicBoolean)param;
+ if (outputBuffer.isReady()) {
+ isReady.set(true);
} else {
- canWrite.set(false);
+ isReady.set(false);
}
}
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1477657&r1=1477656&r2=1477657&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Tue
Apr 30 14:24:51 2013
@@ -456,7 +456,7 @@ public class InternalNioOutputBuffer ext
return bufferedWriteSize;
}
- public boolean isWritable() {
+ public boolean isReady() {
return !hasDataToWrite();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
