Change method name so it is easier to distinguish between async and comet processing...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1001564 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java
index 02ec3ee..70d0609 100644 (file)
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -660,7 +660,7 @@ public class AjpProcessor implements ActionHook {
             RequestInfo rp = request.getRequestProcessor();
             if ( rp.getStage() != org.apache.coyote.Constants.STAGE_SERVICE ) { //async handling
                 dispatch.set(true);
-                endpoint.processSocket(this.socket, SocketStatus.OPEN);
+                endpoint.processSocketAsync(this.socket, SocketStatus.OPEN);
             } else {
                 dispatch.set(false);
             }
@@ -674,7 +674,7 @@ public class AjpProcessor implements ActionHook {
             RequestInfo rp = request.getRequestProcessor();
             AtomicBoolean dispatch = (AtomicBoolean)param;
             if ( rp.getStage() != org.apache.coyote.Constants.STAGE_SERVICE ) {//async handling
-                endpoint.processSocket(this.socket, SocketStatus.OPEN);
+                endpoint.processSocketAsync(this.socket, SocketStatus.OPEN);
                 dispatch.set(true);
             } else { 
                 dispatch.set(true);

diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index 1a88f84..6e59e1a 100644 (file)
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -502,7 +502,7 @@ public class Http11Processor extends AbstractHttp11Processor implements ActionHo
             RequestInfo rp = request.getRequestProcessor();
             if ( rp.getStage() != org.apache.coyote.Constants.STAGE_SERVICE ) { //async handling
                 dispatch.set(true);
-                endpoint.processSocket(this.socket, SocketStatus.OPEN);
+                endpoint.processSocketAsync(this.socket, SocketStatus.OPEN);
             } else {
                 dispatch.set(false);
             }
@@ -516,7 +516,7 @@ public class Http11Processor extends AbstractHttp11Processor implements ActionHo
             RequestInfo rp = request.getRequestProcessor();
             AtomicBoolean dispatch = (AtomicBoolean)param;
             if ( rp.getStage() != org.apache.coyote.Constants.STAGE_SERVICE ) {//async handling
-                endpoint.processSocket(this.socket, SocketStatus.OPEN);
+                endpoint.processSocketAsync(this.socket, SocketStatus.OPEN);
                 dispatch.set(true);
             } else { 
                 dispatch.set(true);

diff --git a/java/org/apache/tomcat/util/net/JIoEndpoint.java b/java/org/apache/tomcat/util/net/JIoEndpoint.java
index 6d5dc61..4e5d299 100644 (file)
--- a/java/org/apache/tomcat/util/net/JIoEndpoint.java
+++ b/java/org/apache/tomcat/util/net/JIoEndpoint.java
@@ -149,7 +149,7 @@ public class JIoEndpoint extends AbstractEndpoint {
                     SocketWrapper<Socket> socket = sockets.next();
                     long access = socket.getLastAccess();
                     if ((now-access)>socket.getTimeout()) {
-                        processSocket(socket,SocketStatus.TIMEOUT);
+                        processSocketAsync(socket,SocketStatus.TIMEOUT);
                     }
                 }
                 
@@ -538,7 +538,8 @@ public class JIoEndpoint extends AbstractEndpoint {
      *                  Returning <code>false</code> is an indication to close
      *                  the socket immediately.
      */
-    public boolean processSocket(SocketWrapper<Socket> socket, SocketStatus status) {
+    public boolean processSocketAsync(SocketWrapper<Socket> socket,
+            SocketStatus status) {
         try {
             if (waitingRequests.remove(socket)) {
                 SocketProcessor proc = new SocketProcessor(socket,status);