Browse Source

Merge "Ignore IOException thrown from close"

stable-4.5
Shawn Pearce 8 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
b4192093f1
  1. 11
      org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java

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

@ -990,7 +990,16 @@ public abstract class FS {
new StreamGobbler(inRedirect, outputStream) new StreamGobbler(inRedirect, outputStream)
.call(); .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(); return process.waitFor();
} catch (IOException e) { } catch (IOException e) {
ioException = e; ioException = e;

Loading…
Cancel
Save