[FIXED JENKINS-38541] SocketTimeoutException should not be fatal for …

…BIONetworkLayer (#111)
jenkinsci · Sep 28, 2016 · e537360 · e537360
1 parent f0f10b0
commit e537360
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/java/org/jenkinsci/remoting/protocol/impl/BIONetworkLayer.java b/src/main/java/org/jenkinsci/remoting/protocol/impl/BIONetworkLayer.java
@@ -23,6 +23,7 @@
  */
 package org.jenkinsci.remoting.protocol.impl;
 
+import java.net.SocketTimeoutException;
 import java.util.logging.LogRecord;
 import javax.annotation.Nonnull;
 import java.io.EOFException;
@@ -246,6 +247,9 @@ public void run() {
                                 onRecvClosed();
                                 return;
                             }
+                        } catch (SocketTimeoutException e) {
+                            // perfectly normal, loop back around and check everything is still open before retrying
+                            continue;
                         } catch (ClosedChannelException e) {
                             onRecvClosed();
                             return;