diff options
| -rw-r--r-- | src/main/java/com/gitblit/utils/JGitUtils.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/com/gitblit/utils/JGitUtils.java b/src/main/java/com/gitblit/utils/JGitUtils.java index 0cee70d5..190872a7 100644 --- a/src/main/java/com/gitblit/utils/JGitUtils.java +++ b/src/main/java/com/gitblit/utils/JGitUtils.java @@ -2256,8 +2256,10 @@ public class JGitUtils { } } catch (IOException e) { LOGGER.error("Failed to determine canMerge", e); - } finally { - revWalk.release(); + } finally {
+ if (revWalk != null) { + revWalk.release();
+ } } return MergeStatus.NOT_MERGEABLE; } @@ -2347,8 +2349,10 @@ public class JGitUtils { } } catch (IOException e) { LOGGER.error("Failed to merge", e); - } finally { - revWalk.release(); + } finally {
+ if (revWalk != null) { + revWalk.release();
+ } } return new MergeResult(MergeStatus.FAILED, null); } |