Code clean-up

Align end-point behaviours. Should then be easier to apply async chnages.

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

diff --git a/java/org/apache/tomcat/util/net/JIoEndpoint.java b/java/org/apache/tomcat/util/net/JIoEndpoint.java
index 8371449..2200c9d 100644 (file)
--- a/java/org/apache/tomcat/util/net/JIoEndpoint.java
+++ b/java/org/apache/tomcat/util/net/JIoEndpoint.java
@@ -180,8 +180,11 @@ public class JIoEndpoint extends AbstractEndpoint {
                     }
                 }
 
-                // Accept the next incoming connection from the server socket
+                if (!running) {
+                    break;
+                }
                 try {
+                    // Accept the next incoming connection from the server socket
                     Socket socket = serverSocketFactory.acceptSocket(serverSocket);
                     serverSocketFactory.initSocket(socket);
                     // Hand this socket off to an appropriate processor

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 5d6d628..2f2c9a1 100644 (file)
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -761,8 +761,10 @@ public class NioEndpoint extends AbstractEndpoint {
          */
         @Override
         public void run() {
+            
             // Loop until we receive a shutdown command
             while (running) {
+                
                 // Loop if endpoint is paused
                 while (paused && running) {
                     try {
@@ -771,6 +773,10 @@ public class NioEndpoint extends AbstractEndpoint {
                         // Ignore
                     }
                 }
+
+                if (!running) {
+                    break;
+                }
                 try {
                     // Accept the next incoming connection from the server socket
                     SocketChannel socket = serverSock.accept();