Merge pull request #38 from jenkinsci/JENKINS-22932

JENKINS-22932
jenkinsci · Apr 16, 2015 · 281ee8e · 281ee8e · dimacus · Jun 30, 2015
2 parents ba844a6 + aabba03
commit 281ee8e
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/main/java/org/jenkinsci/remoting/nio/NioChannelHub.java b/src/main/java/org/jenkinsci/remoting/nio/NioChannelHub.java
@@ -485,8 +485,7 @@ protected CommandTransport makeTransport(InputStream is, OutputStream os, Mode m
                         throw (InterruptedIOException)new InterruptedIOException().initCause(e);
                     }
 
-                    if (selectorThread==null)
-                        throw new IOException("NioChannelHub is not currently running",whatKilledSelectorThread);
+                    ensureValid();
 
                     NioTransport t;
                     if (r==w)       t = new MonoNioTransport(getName(),r,cap);
@@ -542,6 +541,7 @@ public void run() {
                     selectorThread.setName("NioChannelHub keys=" + selector.keys().size() + " gen=" + (gen++) + ": " + oldName);
                     selector.select();
                 } catch (IOException e) {
+                    whatKilledSelectorThread = e;
                     LOGGER.log(WARNING, "Failed to select", e);
                     abortAll(e);
                     return;
@@ -646,18 +646,20 @@ public void run() {
             // TODO: what happens to all the registered ChannelPairs? don't we need to shut them down?
             whatKilledSelectorThread = e;
         } catch (RuntimeException e) {
-            abortAll(e);
-            LOGGER.log(WARNING, "Unexpected shutdown of the selector thread", e);
             whatKilledSelectorThread = e;
+            LOGGER.log(WARNING, "Unexpected shutdown of the selector thread", e);
+            abortAll(e);
             throw e;
         } catch (Error e) {
-            abortAll(e);
-            LOGGER.log(WARNING, "Unexpected shutdown of the selector thread", e);
             whatKilledSelectorThread = e;
+            LOGGER.log(WARNING, "Unexpected shutdown of the selector thread", e);
+            abortAll(e);
             throw e;
         } finally {
             selectorThread.setName(oldName);
             selectorThread = null;
+            if (whatKilledSelectorThread==null)
+                whatKilledSelectorThread = new AssertionError("NioChannelHub shouldn't exit normally");
         }
     }