svn commit: r1001552 - /tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java

[markt]

Author: markt
Date: Sun Sep 26 22:50:30 2010
New Revision: 1001552

URL: http://svn.apache.org/viewvc?rev=1001552&view=rev
Log:
More NPE avoidance.
Keep process methods aligned.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=1001552&r1=1001551&r2=1001552&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Sun Sep 26 
22:50:30 2010
@@ -508,11 +508,10 @@ public class JIoEndpoint extends Abstrac
             SocketWrapper<Socket> wrapper = new SocketWrapper<Socket>(socket);
             wrapper.setKeepAliveLeft(getMaxKeepAliveRequests());
             // During shutdown, executor may be null - avoid NPE
-            if (running) {
-                getExecutor().execute(new SocketProcessor(wrapper));
-                return true;
+            if (!running) {
+                return false;
             }
-            return false;
+            getExecutor().execute(new SocketProcessor(wrapper));
         } catch (RejectedExecutionException x) {
             log.warn("Socket processing request was rejected for:"+socket,x);
             return false;
@@ -522,6 +521,7 @@ public class JIoEndpoint extends Abstrac
             log.error(sm.getString("endpoint.process.fail"), t);
             return false;
         }
+        return true;
     }
     
     
@@ -553,6 +553,10 @@ public class JIoEndpoint extends Abstrac
                         Thread.currentThread().setContextClassLoader(
                                 getClass().getClassLoader());
                     }
+                    // During shutdown, executor may be null - avoid NPE
+                    if (!running) {
+                        return false;
+                    }
                     getExecutor().execute(proc);
                 }finally {
                     if (Globals.IS_SECURITY_ENABLED) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org