From 9f1b868070dd22cd7d8d359cc3481e32ab39627e Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 22 Jun 2011 23:32:17 +0000
Subject: [PATCH] Remove the local socket object

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1138682 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/coyote/ajp/AjpNioProtocol.java       |  5 ++---
 java/org/apache/coyote/http11/Http11NioProtocol.java | 13 ++++++-------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AjpNioProtocol.java b/java/org/apache/coyote/ajp/AjpNioProtocol.java
index 9053c056e..7b011fb14 100644
--- a/java/org/apache/coyote/ajp/AjpNioProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpNioProtocol.java
@@ -170,7 +170,6 @@ public class AjpNioProtocol extends AbstractAjpProtocol {
         @Override
         public SocketState process(SocketWrapper<NioChannel> socketWrapper,
                 SocketStatus status) {
-            NioChannel socket = socketWrapper.getSocket();
             AjpNioProcessor processor = connections.remove(socketWrapper);
 
             socketWrapper.setAsync(false); //no longer check for timeout
@@ -188,7 +187,7 @@ public class AjpNioProtocol extends AbstractAjpProtocol {
                     if (processor.isAsync() || state == SocketState.ASYNC_END) {
                         state = processor.asyncDispatch(status);
                     } else {
-                        state = processor.process(socket);
+                        state = processor.process(socketWrapper.getSocket());
                     }
 
                     if (processor.isAsync()) {
@@ -206,7 +205,7 @@ public class AjpNioProtocol extends AbstractAjpProtocol {
                     // In keep-alive but between requests. OK to recycle
                     // processor. Continue to poll for the next request.
                     release(socketWrapper, processor);
-                    socket.getPoller().add(socket);
+                    socketWrapper.getSocket().getPoller().add(socketWrapper.getSocket());
                 } else {
                     // Connection closed. OK to recycle the processor.
                     release(socketWrapper, processor);
diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
index ed2394259..6f27bde3b 100644
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -233,7 +233,6 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
         @Override
         public SocketState process(SocketWrapper<NioChannel> socketWrapper,
                 SocketStatus status) {
-            NioChannel socket = socketWrapper.getSocket();
             Http11NioProcessor processor = connections.remove(socketWrapper);
 
             socketWrapper.setAsync(false); //no longer check for timeout
@@ -248,8 +247,8 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
 
                 if (proto.isSSLEnabled() &&
                         (proto.sslImplementation != null)
-                        && (socket instanceof SecureNioChannel)) {
-                    SecureNioChannel ch = (SecureNioChannel)socket;
+                        && (socketWrapper.getSocket() instanceof SecureNioChannel)) {
+                    SecureNioChannel ch = (SecureNioChannel)socketWrapper.getSocket();
                     processor.setSslSupport(
                             proto.sslImplementation.getSSLSupport(
                                     ch.getSslEngine().getSession()));
@@ -264,7 +263,7 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
                     } else if (processor.comet) {
                         state = processor.event(status);
                     } else {
-                        state = processor.process(socket);
+                        state = processor.process(socketWrapper.getSocket());
                     }
 
                     if (processor.isAsync()) {
@@ -284,8 +283,8 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
                         //  - this is comet request
                         //  - the request line/headers have not been completely
                         //    read
-                        SelectionKey key = socket.getIOChannel().keyFor(
-                                socket.getPoller().getSelector());
+                        SelectionKey key = socketWrapper.getSocket().getIOChannel().keyFor(
+                                socketWrapper.getSocket().getPoller().getSelector());
                         key.interestOps(SelectionKey.OP_READ);
                         ((KeyAttachment) socketWrapper).interestOps(
                                 SelectionKey.OP_READ);
@@ -294,7 +293,7 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
                     // In keep-alive but between requests. OK to recycle
                     // processor. Continue to poll for the next request.
                     release(socketWrapper, processor);
-                    socket.getPoller().add(socket);
+                    socketWrapper.getSocket().getPoller().add(socketWrapper.getSocket());
                 } else {
                     // Connection closed. OK to recycle the processor.
                     release(socketWrapper, processor);
-- 
2.11.0