motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Ignore IOException thrown from close"

This commit is contained in:
Shawn Pearce 2016-08-19 19:10:58 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent f15e9c088a 108bee17cf
commit b4192093f1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
View File

@ -990,7 +990,16 @@ public int runProcess(ProcessBuilder processBuilder,
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;