svn commit: r1529793 - /tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java

[markt]

Author: markt
Date: Mon Oct  7 08:48:52 2013
New Revision: 1529793

URL: http://svn.apache.org/r1529793
Log:
Avoid NPE

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1529793&r1=1529792&r2=1529793&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Mon Oct  
7 08:48:52 2013
@@ -639,7 +639,7 @@ public abstract class AbstractEndpoint<S
     public void executeNonBlockingDispatches(SocketWrapper<S> socketWrapper) {
         Iterator<DispatchType> dispatches = 
socketWrapper.getIteratorAndClearDispatches();
 
-        while (dispatches.hasNext()) {
+        while (dispatches != null && dispatches.hasNext()) {
             DispatchType dispatchType = dispatches.next();
             processSocket(socketWrapper, dispatchType.getSocketStatus(), 
false);
         }



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