From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 29 Sep 2010 16:02:24 +0000 (+0000)
Subject: Rename local variable to make code clearer
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a018150291191e640b2454a2f31bfef35017ee3e;p=tomcat7.0

Rename local variable to make code clearer

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

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<Long> 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);
                 }
             }