add in some more checks

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

diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
index d166b16..a0837c0 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
@@ -279,9 +279,9 @@ public class NioReceiver extends ReceiverBase implements Runnable, ChannelReceiv
                     continue; // nothing to do
                 }
                 // get an iterator over the set of selected keys
-                Iterator it = selector.selectedKeys().iterator();
+                Iterator it = (selector!=null)?selector.selectedKeys().iterator():null;
                 // look at each key in the selected set
-                while (it.hasNext() && selector!=null) {
+                while (selector!=null && it.hasNext()) {
                     SelectionKey key = (SelectionKey) it.next();
                     // Is a new connection coming in?
                     if (key.isAcceptable()) {