Merge pull request #133 from jenkinsci/jtnord-patch-1

[JENKINS-39835] - Be extra defensive about Errors and Exceptions
jenkinsci · Dec 22, 2016 · 32674f6 · 32674f6
2 parents b50beca + ec9b5c1
commit 32674f6
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/main/java/org/jenkinsci/remoting/protocol/impl/NIONetworkLayer.java b/src/main/java/org/jenkinsci/remoting/protocol/impl/NIONetworkLayer.java
@@ -177,15 +177,19 @@ public void ready(boolean accept, boolean connect, boolean read, boolean write)
                         }
                         recvKey.cancel();
                         onRecvClosed();
-                    } catch (RuntimeException e) {
+                    } catch (Throwable t) {
                         // this should *never* happen... but just in case it does we will log & close connection
-                        if (LOGGER.isLoggable(Level.WARNING)) {
-                            LogRecord record = new LogRecord(Level.WARNING, "[{0}] Uncaught {1}");
-                            record.setThrown(e);
-                            record.setParameters(new Object[]{stack().name(), e.getClass().getSimpleName()});
+                        try {
+                            if (LOGGER.isLoggable(Level.SEVERE)) {
+                                LogRecord record = new LogRecord(Level.SEVERE, "[{0}] Uncaught {1}");
+                                record.setThrown(t);
+                                record.setParameters(new Object[]{stack().name(), t.getClass().getSimpleName()});
+                            }
+                        } finally {
+                            // incase this was an OOMErr and logging caused another OOMErr
+                            recvKey.cancel();
+                            onRecvClosed();
                         }
-                        recvKey.cancel();
-                        onRecvClosed();
                     } finally {
                         release(recv);
                     }