Author: markt
Date: Mon Feb 11 20:28:56 2013
New Revision: 1444951
URL: http://svn.apache.org/r1444951
Log:
Rename canWrite() -> isReady()
Modified:
tomcat/trunk/java/javax/servlet/ServletOutputStream.java
tomcat/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
Modified: tomcat/trunk/java/javax/servlet/ServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletOutputStream.java?rev=1444951&r1=1444950&r2=1444951&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletOutputStream.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletOutputStream.java Mon Feb 11
20:28:56 2013
@@ -278,7 +278,7 @@ public abstract class ServletOutputStrea
* TODO SERVLET 3.1
* @return TODO
*/
- public abstract boolean canWrite();
+ public abstract boolean isReady();
/**
* TODO SERVLET 3.1
Modified: tomcat/trunk/java/javax/servlet/http/HttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServlet.java?rev=1444951&r1=1444950&r2=1444951&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServlet.java Mon Feb 11 20:28:56
2013
@@ -868,7 +868,7 @@ class NoBodyOutputStream extends Servlet
}
@Override
- public boolean canWrite() {
+ public boolean isReady() {
// TODO SERVLET 3.1
return false;
}
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=1444951&r1=1444950&r2=1444951&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java Mon
Feb 11 20:28:56 2013
@@ -110,7 +110,7 @@ public class CoyoteOutputStream
}
@Override
- public boolean canWrite() {
+ public boolean isReady() {
return ob.canWrite();
}
Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1444951&r1=1444950&r2=1444951&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Mon Feb 11
20:28:56 2013
@@ -997,7 +997,7 @@ public class ExpiresFilter extends Filte
* TODO SERVLET 3.1
*/
@Override
- public boolean canWrite() {
+ public boolean isReady() {
// TODO Auto-generated method stub
return false;
}
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java?rev=1444951&r1=1444950&r2=1444951&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
Mon Feb 11 20:28:56 2013
@@ -68,7 +68,7 @@ public class ByteArrayServletOutputStrea
* TODO SERVLET 3.1
*/
@Override
- public boolean canWrite() {
+ public boolean isReady() {
// TODO Auto-generated method stub
return false;
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java?rev=1444951&r1=1444950&r2=1444951&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Mon Feb 11 20:28:56 2013
@@ -38,7 +38,7 @@ public abstract class AbstractServletOut
private volatile byte[] buffer;
@Override
- public final boolean canWrite() {
+ public final boolean isReady() {
if (listener == null) {
throw new IllegalStateException(
sm.getString("upgrade.sos.canWrite.is"));
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java?rev=1444951&r1=1444950&r2=1444951&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java (original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java Mon Feb 11
20:28:56 2013
@@ -274,7 +274,7 @@ public class Util {
* TODO SERVLET 3.1
*/
@Override
- public boolean canWrite() {
+ public boolean isReady() {
// TODO Auto-generated method stub
return false;
}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java?rev=1444951&r1=1444950&r2=1444951&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
Mon Feb 11 20:28:56 2013
@@ -75,7 +75,7 @@ public class WsRemoteEndpointServer exte
boolean complete = true;
try {
// If this is false there will be a call back when it is true
- while (sos.canWrite()) {
+ while (sos.isReady()) {
complete = true;
for (ByteBuffer buffer : buffers) {
if (buffer.hasRemaining()) {
Modified:
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java?rev=1444951&r1=1444950&r2=1444951&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
Mon Feb 11 20:28:56 2013
@@ -409,7 +409,7 @@ public class TestNonBlockingAPI extends
long start = System.currentTimeMillis();
long end = System.currentTimeMillis();
long before = left;
- while (left > 0 &&
ctx.getResponse().getOutputStream().canWrite()) {
+ while (left > 0 &&
ctx.getResponse().getOutputStream().isReady()) {
byte[] b = new byte[(int) Math.min(chunk,
bytesToDownload)];
Arrays.fill(b, (byte) 'X');
ctx.getResponse().getOutputStream().write(b);
@@ -418,7 +418,7 @@ public class TestNonBlockingAPI extends
}
System.out.println("Write took:" + (end - start) + " ms. Bytes
before=" + before + " after=" + left);
// only call complete if we have emptied the buffer
- if (left == 0 &&
ctx.getResponse().getOutputStream().canWrite()) {
+ if (left == 0 &&
ctx.getResponse().getOutputStream().isReady()) {
// it is illegal to call complete
// if there is a write in progress
ctx.complete();
Modified: tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java?rev=1444951&r1=1444950&r2=1444951&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java Mon Feb
11 20:28:56 2013
@@ -233,7 +233,7 @@ public class TestUpgrade extends TomcatB
while (sis.isReady()) {
int read = sis.read(buffer);
if (read > 0) {
- if (sos.canWrite()) {
+ if (sos.isReady()) {
sos.write(buffer, 0, read);
} else {
throw new IOException("Unable to echo data. " +
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java?rev=1444951&r1=1444950&r2=1444951&view=diff
==============================================================================
---
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
Mon Feb 11 20:28:56 2013
@@ -265,7 +265,7 @@ public class CompressionResponseStream e
* TODO SERVLET 3.1
*/
@Override
- public boolean canWrite() {
+ public boolean isReady() {
// TODO Auto-generated method stub
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
