From a018150291191e640b2454a2f31bfef35017ee3e Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 29 Sep 2010 16:02:24 +0000 Subject: [PATCH] Rename local variable to make code clearer git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1002703 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/http11/Http11AprProtocol.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java index 8084ac51d..d2ed55e6d 100644 --- a/java/org/apache/coyote/http11/Http11AprProtocol.java +++ b/java/org/apache/coyote/http11/Http11AprProtocol.java @@ -299,14 +299,14 @@ public class Http11AprProtocol extends AbstractHttp11Protocol { @Override public SocketState event(SocketWrapper socket, SocketStatus status) { - Http11AprProcessor result = connections.get(socket); + Http11AprProcessor processor = connections.get(socket); SocketState state = SocketState.CLOSED; - if (result != null) { - if (result.comet) { + if (processor != null) { + if (processor.comet) { // Call the appropriate event try { - state = result.event(status); + state = processor.event(status); } catch (java.net.SocketException e) { // SocketExceptions are normal Http11AprProtocol.log.debug(sm.getString( @@ -330,7 +330,7 @@ public class Http11AprProtocol extends AbstractHttp11Protocol { } finally { if (state != SocketState.LONG) { connections.remove(socket); - recycledProcessors.offer(result); + recycledProcessors.offer(processor); if (state == SocketState.OPEN) { ((AprEndpoint)proto.endpoint).getPoller().add(socket.getSocket().longValue()); } @@ -338,7 +338,7 @@ public class Http11AprProtocol extends AbstractHttp11Protocol { ((AprEndpoint)proto.endpoint).getCometPoller().add(socket.getSocket().longValue()); } } - } else if (result.isAsync()) { + } else if (processor.isAsync()) { state = asyncDispatch(socket, status); } } -- 2.11.0