Author: fhanik
Date: Fri Feb 22 08:01:41 2008
New Revision: 630234
URL: http://svn.apache.org/viewvc?rev=630234&view=rev
Log:
add in some more checks
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=630234&r1=630233&r2=630234&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Fri Feb 22 08:01:41 2008
@@ -279,9 +279,9 @@
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()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
