Browse Source

Merge branch 'stable-5.1'

* stable-5.1:
  Fix logging null if called process fails

Change-Id: Iba771dd8d680b154cb628c7571a2bbc2ecf50a3b
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
stable-5.2
David Pursehouse 6 years ago
parent
commit
6ad4bd7618
  1. 9
      org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java

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

@ -640,13 +640,16 @@ public abstract class FS {
JGitText.get().commandClosedStderrButDidntExit,
desc, PROCESS_EXIT_TIMEOUT), -1);
fail.set(true);
return false;
}
} catch (InterruptedException e) {
LOG.error(MessageFormat.format(
JGitText.get().threadInterruptedWhileRunning, desc), e);
}
setError(originalError, MessageFormat.format(
JGitText.get().threadInterruptedWhileRunning, desc), -1);
fail.set(true);
return false;
}
return true;
}
private void setError(IOException e, String message, int exitCode) {
exception.set(e);

Loading…
Cancel
Save