[JENKINS-36871] Stop complaining when the channel is already closed

jenkinsci · Aug 3, 2016 · 0ef5cac · 0ef5cac
1 parent d2504bc
commit 0ef5cac
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/java/hudson/remoting/Channel.java b/src/main/java/hudson/remoting/Channel.java
@@ -1154,6 +1154,10 @@ public synchronized void close(Throwable diagnosis) throws IOException {
 
         try {
             send(new CloseCommand(this, diagnosis));
+        } catch (ChannelClosedException e) {
+            logger.log(Level.FINEST, "Channel is already closed", e);
+            terminate(e);
+            return;
         } catch (IOException e) {
             // send should only ever - worst case - throw an IOException so we'll just catch that and not Throwable
             logger.log(Level.WARNING, "Having to terminate early", e);