Fix various errors when stopping the APR connector via JMX (may occur…

… in other scenarios)

- prevent a crash by ensuring all connections are closed via the SocketWrapper
- prevent a memory leak by releasing any Processor associated with a closed connection
Adds release(SocketWrapper) to the Handler interface and adds an implementation to the base AbstractProtocol.AbstractConnectionHandler (replacing the impl. in vaious sub-classes)

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

java/org/apache/coyote/AbstractProtocol.java

@@ -868,6 +868,23 @@ public void release(SocketWrapperBase<S> socket, Processor processor, boolean ad
         }
 
 
+        /**
+         * Expected to be used by the Endpoint to release resources on socket
+         * close, errors etc.
+         */
+        @Override
+        public void release(SocketWrapperBase<S> socketWrapper) {
+            S socket = socketWrapper.getSocket();
+            if (socket != null) {
+                Processor processor = connections.remove(socket);
+                if (processor != null) {
+                    processor.recycle();
+                    recycledProcessors.push(processor);
+                }
+            }
+        }
+
+
         protected abstract Processor createUpgradeProcessor(
                 SocketWrapperBase<?> socket, ByteBuffer leftoverInput,
                 HttpUpgradeHandler httpUpgradeHandler) throws IOException;

java/org/apache/coyote/ajp/AjpNio2Protocol.java

@@ -16,13 +16,11 @@
  */
 package org.apache.coyote.ajp;
 
-import org.apache.coyote.Processor;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.net.Nio2Channel;
 import org.apache.tomcat.util.net.Nio2Endpoint;
 import org.apache.tomcat.util.net.Nio2Endpoint.Handler;
-import org.apache.tomcat.util.net.SocketWrapperBase;
 
 
 /**
@@ -71,20 +69,6 @@ protected Log getLog() {
         }
 
 
-        /**
-         * Expected to be used by the Poller to release resources on socket
-         * close, errors etc.
-         */
-        @Override
-        public void release(SocketWrapperBase<Nio2Channel> socket) {
-            Processor processor = connections.remove(socket.getSocket());
-            if (processor != null) {
-                processor.recycle();
-                recycledProcessors.push(processor);
-            }
-        }
-
-
         @Override
         public void closeAll() {
             for (Nio2Channel channel : connections.keySet()) {

java/org/apache/coyote/ajp/AjpNioProtocol.java

@@ -25,7 +25,6 @@
 import org.apache.tomcat.util.net.NioChannel;
 import org.apache.tomcat.util.net.NioEndpoint;
 import org.apache.tomcat.util.net.NioEndpoint.Handler;
-import org.apache.tomcat.util.net.SocketWrapperBase;
 
 /**
  * This the NIO based protocol handler implementation for AJP.
@@ -96,19 +95,5 @@ public void release(SocketChannel socket) {
                 log.debug(sm.getString("ajpnioprotocol.releaseEnd",
                         socket, Boolean.valueOf(released)));
         }
-
-
-        /**
-         * Expected to be used by the Poller to release resources on socket
-         * close, errors etc.
-         */
-        @Override
-        public void release(SocketWrapperBase<NioChannel> socket) {
-            Processor processor = connections.remove(socket.getSocket());
-            if (processor != null) {
-                processor.recycle();
-                recycledProcessors.push(processor);
-            }
-        }
     }
 }

java/org/apache/coyote/http11/Http11Nio2Protocol.java

@@ -16,13 +16,11 @@
  */
 package org.apache.coyote.http11;
 
-import org.apache.coyote.Processor;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.net.Nio2Channel;
 import org.apache.tomcat.util.net.Nio2Endpoint;
 import org.apache.tomcat.util.net.Nio2Endpoint.Handler;
-import org.apache.tomcat.util.net.SocketWrapperBase;
 
 
 /**
@@ -72,23 +70,6 @@ protected Log getLog() {
             return log;
         }
 
-        /**
-         * Expected to be used by the Endpoint to release resources on socket
-         * close, errors etc.
-         */
-        @Override
-        public void release(SocketWrapperBase<Nio2Channel> socketWrapper) {
-            Nio2Channel socket = socketWrapper.getSocket();
-            if (socket != null) {
-                Processor processor = connections.remove(socket);
-                if (processor != null) {
-                    processor.recycle();
-                    recycledProcessors.push(processor);
-                }
-            }
-        }
-
-
         @Override
         public void closeAll() {
             for (Nio2Channel channel : connections.keySet()) {

java/org/apache/coyote/http11/Http11NioProtocol.java

@@ -25,7 +25,6 @@
 import org.apache.tomcat.util.net.NioChannel;
 import org.apache.tomcat.util.net.NioEndpoint;
 import org.apache.tomcat.util.net.NioEndpoint.Handler;
-import org.apache.tomcat.util.net.SocketWrapperBase;
 
 
 /**
@@ -132,21 +131,5 @@ public void release(SocketChannel socket) {
             if (log.isDebugEnabled())
                 log.debug("Done iterating through our connections to release a socket channel:"+socket +" released:"+released);
         }
-
-        /**
-         * Expected to be used by the Endpoint to release resources on socket
-         * close, errors etc.
-         */
-        @Override
-        public void release(SocketWrapperBase<NioChannel> socketWrapper) {
-            NioChannel socket = socketWrapper.getSocket();
-            if (socket != null) {
-                Processor processor = connections.remove(socket);
-                if (processor != null) {
-                    processor.recycle();
-                    recycledProcessors.push(processor);
-                }
-            }
-        }
     }
 }

java/org/apache/tomcat/util/net/AbstractEndpoint.java

@@ -85,6 +85,14 @@ public SocketState process(SocketWrapperBase<S> socket,
         public Object getGlobal();
 
 
+        /**
+         * Release any resources associated with the given SocketWrapper.
+         *
+         * @param socketWrapper The socketWrapper to release resources for
+         */
+        public void release(SocketWrapperBase<S> socketWrapper);
+
+
         /**
          * Recycle resources associated with the handler.
          */

java/org/apache/tomcat/util/net/AprEndpoint.java

@@ -661,6 +661,14 @@ public void stopInternal() {
         if (running) {
             running = false;
             poller.stop();
+            for (SocketWrapperBase<Long> socketWrapper : connections.values()) {
+                try {
+                    socketWrapper.close();
+                    handler.release(socketWrapper);
+                } catch (IOException e) {
+                    // Ignore
+                }
+            }
             getAsyncTimeout().stop();
             for (AbstractEndpoint.Acceptor acceptor : acceptors) {
                 long waitLeft = 10000;

java/org/apache/tomcat/util/net/Nio2Endpoint.java

@@ -1571,7 +1571,6 @@ public void doClientAuth(SSLSupport sslSupport) {
      * thread local fields.
      */
     public interface Handler extends AbstractEndpoint.Handler<Nio2Channel> {
-        public void release(SocketWrapperBase<Nio2Channel> socket);
         public void closeAll();
     }
 

java/org/apache/tomcat/util/net/NioEndpoint.java

@@ -1455,7 +1455,6 @@ public <A> CompletionState write(ByteBuffer[] srcs, int offset,
      * thread local fields.
      */
     public interface Handler extends AbstractEndpoint.Handler<NioChannel> {
-        public void release(SocketWrapperBase<NioChannel> socket);
         public void release(SocketChannel socket);
     }