Author: markt
Date: Mon Sep 27 00:17:26 2010
New Revision: 1001564
URL: http://svn.apache.org/viewvc?rev=1001564&view=rev
Log:
Change method name so it is easier to distinguish between async and comet
processing. No so important here since comet isn't supported, but need to
change it to align with changes to be made in NIO and APR
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
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=1001564&r1=1001563&r2=1001564&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Mon Sep 27
00:17:26 2010
@@ -660,7 +660,7 @@ public class AjpProcessor implements Act
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 Act
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);
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=1001564&r1=1001563&r2=1001564&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Sep 27
00:17:26 2010
@@ -502,7 +502,7 @@ public class Http11Processor extends Abs
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 Abs
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);
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=1001564&r1=1001563&r2=1001564&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Mon Sep 27
00:17:26 2010
@@ -149,7 +149,7 @@ public class JIoEndpoint extends Abstrac
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 Abstrac
* 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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
