From 49e4be802318aff0211ffadade0a4b1792cddf88 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 27 Sep 2010 00:17:26 +0000 Subject: [PATCH] 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 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1001564 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/ajp/AjpProcessor.java | 4 ++-- java/org/apache/coyote/http11/Http11Processor.java | 4 ++-- java/org/apache/tomcat/util/net/JIoEndpoint.java | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java index 02ec3ee2c..70d060907 100644 --- 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 1a88f8414..6e59e1a35 100644 --- 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 6d5dc613e..4e5d29947 100644 --- 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 = 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 false is an indication to close * the socket immediately. */ - public boolean processSocket(SocketWrapper socket, SocketStatus status) { + public boolean processSocketAsync(SocketWrapper socket, + SocketStatus status) { try { if (waitingRequests.remove(socket)) { SocketProcessor proc = new SocketProcessor(socket,status); -- 2.11.0