From d1543575e2b4bcb0938a2bc88df589c462b227ef Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Fri, 10 Dec 2010 23:50:17 -0800
Subject: [PATCH] [FIXED HUDSON-8244] turns out Process.getErrorStream() needs
 to be explicitly closed even when stderr is redirected to stdout.

---
 changelog.html                      | 3 +++
 core/src/main/java/hudson/Proc.java | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/changelog.html b/changelog.html
index 083f97cf56..5482f2169f 100644
--- a/changelog.html
+++ b/changelog.html
@@ -43,6 +43,9 @@ Upcoming changes</a>
   <li class=bug>
     " (from WhateverTest)" gratuitously appended to test result detail pages.
     (<a href="http://issues.hudson-ci.org/browse/HUDSON-5655">issue 5655</a>)
+  <li class=bug>
+    Fixed a pipe leak to child processes.
+    (<a href="http://issues.hudson-ci.org/browse/HUDSON-8244">issue 8244</a>)
   <li class=rfe>
     Debian package init script now honors <tt>~/.profile</tt>.
   <li class=rfe>
diff --git a/core/src/main/java/hudson/Proc.java b/core/src/main/java/hudson/Proc.java
index 73679ac8ad..25726c3833 100644
--- a/core/src/main/java/hudson/Proc.java
+++ b/core/src/main/java/hudson/Proc.java
@@ -200,6 +200,10 @@ public abstract class Proc {
                 copier2 = new StreamCopyThread(name+": stderr copier", proc.getErrorStream(), err);
                 copier2.start();
             } else {
+                // while this is not discussed in javadoc, even with ProcessBuilder.redirectErrorStream(true),
+                // Process.getErrorStream() still returns a distinct reader end of a pipe that needs to be closed.
+                // this is according to the source code of JVM
+                proc.getErrorStream().close();
                 copier2 = null;
             }
         }