From: markt Date: Wed, 23 Mar 2011 00:36:16 +0000 (+0000) Subject: Rename, no functional change X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=345fc731682e6be13342b753d0c080ede4cd8808;p=tomcat7.0 Rename, no functional change git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1084427 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/coyote/ajp/AjpAprProtocol.java b/java/org/apache/coyote/ajp/AjpAprProtocol.java index 2d862d9a4..13182a2c5 100644 --- a/java/org/apache/coyote/ajp/AjpAprProtocol.java +++ b/java/org/apache/coyote/ajp/AjpAprProtocol.java @@ -227,13 +227,13 @@ public class AjpAprProtocol extends AbstractAjpProtocol { @Override public SocketState asyncDispatch(SocketWrapper socket, SocketStatus status) { - AjpAprProcessor result = connections.get(socket); + AjpAprProcessor processor = connections.get(socket); SocketState state = SocketState.CLOSED; - if (result != null) { + if (processor != null) { // Call the appropriate event try { - state = result.asyncDispatch(socket, status); + state = processor.asyncDispatch(socket, status); } // Future developers: if you discover any other // rare-but-nonfatal exceptions, catch them here, and log as @@ -246,12 +246,12 @@ public class AjpAprProtocol extends AbstractAjpProtocol { AjpAprProtocol.log.error (sm.getString("ajpprotocol.proto.error"), e); } finally { - if (state == SocketState.LONG && result.isAsync()) { - state = result.asyncPostProcess(); + if (state == SocketState.LONG && processor.isAsync()) { + state = processor.asyncPostProcess(); } if (state != SocketState.LONG && state != SocketState.ASYNC_END) { connections.remove(socket); - recycledProcessors.offer(result); + recycledProcessors.offer(processor); if (state == SocketState.OPEN) { ((AprEndpoint)proto.endpoint).getPoller().add(socket.getSocket().longValue()); }