Guarding against NPE in case of concurrent stop().

2011-09-12 21:01:08 +02:00 · 2011-09-12 21:01:08 +02:00 · 9c43e04bb4
parent 55d229e73c
commit 9c43e04bb4
1 changed files with 78 additions and 76 deletions
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java
@ -30,7 +30,6 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;

-
 import org.eclipse.jetty.io.ConnectedEndPoint;
 import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.io.EndPoint;
@ -450,6 +449,9 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
            {
                _selecting=Thread.currentThread();
                final Selector selector=_selector;
+                // Stopped concurrently ?
+                if (selector == null)
+                    return;

                // Make any key changes required
                Object change;