From 87170e14d1260c722c5e534c2e405764153d5946 Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 17 Apr 2014 22:45:20 -0400 Subject: [PATCH] [findbugs] Add null check when closing a RevWalk in JGitUtils --- src/main/java/com/gitblit/utils/JGitUtils.java | 12 ++++++++---- 1 file 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); } -- 2.39.5