motiejus
/
jgit
1
Fork 0
Code Releases Activity

Fix IllegalThreadStateException if stderr closed without exiting 

If some process executed by FS#readPipe lived for a while after
closing stderr, FS#GobblerThread#run failed with an
IllegalThreadStateException exception when accessing p.exitValue()
for the process which is still alive.

Add Process#waitFor calls to wait for the process completion.

Bug: 528335
Change-Id: I87e0b6f9ad0b995dbce46ddfb877e33eaf3ae5a6
Signed-off-by: Dmitry Pavlenko <pavlenko@tmatesoft.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Dmitry Pavlenko 2017-12-07 19:36:35 +01:00 committed by Matthias Sohn
parent deb68cfb4a
commit 7ccf38adc6
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
View File

@ -120,6 +120,7 @@ classCastNotA=Not a {0}
cloneNonEmptyDirectory=Destination path "{0}" already exists and is not an empty directory
closed=closed
collisionOn=Collision on {0}
commandClosedStderrButDidntExit=Command {0} closed stderr stream but didn''t exit within timeout {1} seconds
commandRejectedByHook=Rejected by "{0}" hook.\n{1}
commandWasCalledInTheWrongState=Command {0} was called in the wrong state
commitAlreadyExists=exists {0}
@ -645,6 +646,7 @@ tagAlreadyExists=tag ''{0}'' already exists
tagNameInvalid=tag name {0} is invalid
tagOnRepoWithoutHEADCurrentlyNotSupported=Tag on repository without HEAD currently not supported
theFactoryMustNotBeNull=The factory must not be null
threadInterruptedWhileRunning="Current thread interrupted while running {0}"
timeIsUncertain=Time is uncertain
timerAlreadyTerminated=Timer already terminated
tooManyCommands=Too many commands

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
View File

@ -179,6 +179,7 @@ public static JGitText get() {
/***/ public String cloneNonEmptyDirectory;
/***/ public String closed;
/***/ public String collisionOn;
/***/ public String commandClosedStderrButDidntExit;
/***/ public String commandRejectedByHook;
/***/ public String commandWasCalledInTheWrongState;
/***/ public String commitAlreadyExists;
@ -705,6 +706,7 @@ public static JGitText get() {
/***/ public String tagOnRepoWithoutHEADCurrentlyNotSupported;
/***/ public String transactionAborted;
/***/ public String theFactoryMustNotBeNull;
/***/ public String threadInterruptedWhileRunning;
/***/ public String timeIsUncertain;
/***/ public String timerAlreadyTerminated;
/***/ public String tooManyCommands;

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

@ -564,6 +564,10 @@ protected static String readPipe(File dir, String[] command,
}
private static class GobblerThread extends Thread {
/* The process has 5 seconds to exit after closing stderr */
private static final int PROCESS_EXIT_TIMEOUT = 5;
private final Process p;
private final String desc;
private final String dir;
@ -586,15 +590,16 @@ public void run() {
err.append((char) ch);
}
} catch (IOException e) {
if (p.exitValue() != 0) {
setError(e, e.getMessage());
if (waitForProcessCompletion(e) && p.exitValue() != 0) {
setError(e, e.getMessage(), p.exitValue());
fail.set(true);
} else {
// ignore. command terminated faster and stream was just closed
// or the process didn't terminate within timeout
}
} finally {
if (err.length() > 0) {
setError(null, err.toString());
if (waitForProcessCompletion(null) && err.length() > 0) {
setError(null, err.toString(), p.exitValue());
if (p.exitValue() != 0) {
fail.set(true);
}
@ -602,11 +607,27 @@ public void run() {
}
}
private void setError(IOException e, String message) {
@SuppressWarnings("boxing")
private boolean waitForProcessCompletion(IOException originalError) {
try {
if (!p.waitFor(PROCESS_EXIT_TIMEOUT, TimeUnit.SECONDS)) {
setError(originalError, MessageFormat.format(
JGitText.get().commandClosedStderrButDidntExit,
desc, PROCESS_EXIT_TIMEOUT), -1);
fail.set(true);
}
} catch (InterruptedException e) {
LOG.error(MessageFormat.format(
JGitText.get().threadInterruptedWhileRunning, desc), e);
}
return false;
}
private void setError(IOException e, String message, int exitCode) {
exception.set(e);
errorMessage.set(MessageFormat.format(
JGitText.get().exceptionCaughtDuringExcecutionOfCommand,
desc, dir, Integer.valueOf(p.exitValue()), message));
desc, dir, Integer.valueOf(exitCode), message));
}
}