[JENKINS-32825] Deadlock in Channel Abort

Additional `closed` state check introduced to break writing loop.
jenkinsci · Feb 7, 2016 · 3ea38c8 · 3ea38c8
1 parent 54cec7a
commit 3ea38c8
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/remoting/nio/FifoBuffer.java b/src/main/java/org/jenkinsci/remoting/nio/FifoBuffer.java
@@ -332,8 +332,12 @@ public void write(byte[] buf, int start, int len) throws InterruptedException, I
  int chunk;
 
  synchronized (lock) {
- while ((chunk = Math.min(len,writable()))==0)
+ while ((chunk = Math.min(len,writable()))==0) {
+ if (closed)
+ throw new IOException("closed during write operation");
+
  lock.wait(100);
+ }
 
  w.write(buf, start, chunk);