From: markt Date: Wed, 23 Mar 2011 00:27:00 +0000 (+0000) Subject: Rename, no functional change X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=045c28140a56332204b3a33595f40712e39c26d0;p=tomcat7.0 Rename, no functional change git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1084424 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java index 1581fd18e..d4db68201 100644 --- a/java/org/apache/coyote/http11/Http11AprProtocol.java +++ b/java/org/apache/coyote/http11/Http11AprProtocol.java @@ -367,13 +367,13 @@ public class Http11AprProtocol extends AbstractHttp11Protocol { @Override public SocketState asyncDispatch(SocketWrapper socket, SocketStatus status) { - Http11AprProcessor result = connections.get(socket.getSocket()); + Http11AprProcessor processor = connections.get(socket.getSocket()); 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 rare-but-nonfatal // exceptions, catch them here, and log as per {@link #event()} // above. @@ -385,13 +385,13 @@ public class Http11AprProtocol extends AbstractHttp11Protocol { Http11AprProtocol.log.error (sm.getString("http11protocol.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.getSocket()); socket.setAsync(false); - recycledProcessors.offer(result); + recycledProcessors.offer(processor); if (state == SocketState.OPEN) { ((AprEndpoint)proto.endpoint).getPoller().add(socket.getSocket().longValue()); }