diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2018-09-13 10:01:01 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2018-09-13 10:01:01 +0900 |
| commit | 6ad4bd761811079708e2d1895761501594e187a4 (patch) | |
| tree | f21ff0cb26bd118aaac7af4c2ee96f66546d21ad | |
| parent | 63fe317f600dcc0e4b2788b5db18ea24e289012b (diff) | |
| parent | 0c8200b27b60baafd81bbaeeec0eb671891308e5 (diff) | |
| download | jgit-6ad4bd761811079708e2d1895761501594e187a4.tar.gz jgit-6ad4bd761811079708e2d1895761501594e187a4.zip | |
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>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java | 9 |
1 files changed, 6 insertions, 3 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 6d3be7c686..ea3cf5f518 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java @@ -640,12 +640,15 @@ 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 false; + return true; } private void setError(IOException e, String message, int exitCode) { |