Merge "Ignore IOException thrown from close"

1 files changed, 10 insertions, 1 deletions

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
index 253acbb76a..ec587d5997 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
@@ -990,7 +990,16 @@ public abstract class FS {
 				new StreamGobbler(inRedirect, outputStream)
 						.call();
 			}
-			outputStream.close();
+			try {
+				outputStream.close();
+			} catch (IOException e) {
+				// When the process exits before consuming the input, the OutputStream
+				// is replaced with the null output stream. This null output stream
+				// throws IOException for all write calls. When StreamGobbler fails to
+				// flush the buffer because of this, this close call tries to flush it
+				// again. This causes another IOException. Since we ignore the
+				// IOException in StreamGobbler, we also ignore the exception here.
+			}
 			return process.waitFor();
 		} catch (IOException e) {
 			ioException = e;