svn commit: r1652123 - in /tomcat/trunk/java/org/apache: coyote/http11/upgrade/UpgradeServletInputStream.java tomcat/util/net/AprEndpoint.java tomcat/util/net/Nio2Endpoint.java tomcat/util/net/NioEndpoint.java tomcat/util/net/SocketWrapperBase.java

[markt]

Author: markt
Date: Thu Jan 15 14:56:59 2015
New Revision: 1652123

URL: http://svn.apache.org/r1652123
Log:
Rename for clarity.

Modified:
    
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
    tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
    tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
    tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java?rev=1652123&r1=1652122&r2=1652123&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
 (original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
 Thu Jan 15 14:56:59 2015
@@ -68,7 +68,7 @@ public class UpgradeServletInputStream e
         }
 
         try {
-            ready = Boolean.valueOf(socketWrapper.isReady());
+            ready = Boolean.valueOf(socketWrapper.isReadyForRead());
         } catch (IOException e) {
             onError(e);
         }

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1652123&r1=1652122&r2=1652123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu Jan 15 
14:56:59 2015
@@ -2507,7 +2507,7 @@ public class AprEndpoint extends Abstrac
 
 
         @Override
-        public boolean isReady() {
+        public boolean isReadyForRead() {
             return !eagain;
         }
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1652123&r1=1652122&r2=1652123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu Jan 15 
14:56:59 2015
@@ -965,7 +965,7 @@ public class Nio2Endpoint extends Abstra
 
 
         @Override
-        public boolean isReady() throws IOException {
+        public boolean isReadyForRead() throws IOException {
             synchronized (readCompletionHandler) {
                 if (!readPending.tryAcquire()) {
                     readInterest = true;

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1652123&r1=1652122&r2=1652123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu Jan 15 
14:56:59 2015
@@ -1400,7 +1400,7 @@ public class NioEndpoint extends Abstrac
 
 
         @Override
-        public boolean isReady() throws IOException {
+        public boolean isReadyForRead() throws IOException {
             socketBufferHandler.configureReadBufferForRead();
 
             if (socketBufferHandler.getReadBuffer().remaining() > 0) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1652123&r1=1652122&r2=1652123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Thu Jan 
15 14:56:59 2015
@@ -277,7 +277,7 @@ public abstract class SocketWrapperBase<
 
 
     public abstract int read(boolean block, byte[] b, int off, int len) throws 
IOException;
-    public abstract boolean isReady() throws IOException;
+    public abstract boolean isReadyForRead() throws IOException;
 
     /**
      * Return input that has been read to the input buffer for re-reading by 
the



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org