From 4e84166db5c5538e3984d9d2d6bb1f9902e65ee0 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 04 Nov 2014 17:38:17 -0500 Subject: [PATCH] Merged #217 "Exclude SSLv3 from Gitblit GO https protocols" --- src/main/java/com/gitblit/utils/DiffUtils.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gitblit/utils/DiffUtils.java b/src/main/java/com/gitblit/utils/DiffUtils.java index b49497e..dd2a780 100644 --- a/src/main/java/com/gitblit/utils/DiffUtils.java +++ b/src/main/java/com/gitblit/utils/DiffUtils.java @@ -363,19 +363,19 @@ public static DiffStat getDiffStat(Repository repository, String base, String tip) { RevCommit baseCommit = null; RevCommit tipCommit = null; - RevWalk revWalk = null; + RevWalk revWalk = new RevWalk(repository); try { - revWalk = new RevWalk(repository); tipCommit = revWalk.parseCommit(repository.resolve(tip)); if (!StringUtils.isEmpty(base)) { baseCommit = revWalk.parseCommit(repository.resolve(base)); } + return getDiffStat(repository, baseCommit, tipCommit, null); } catch (Exception e) { LOGGER.error("failed to generate diffstat!", e); } finally { revWalk.dispose(); } - return getDiffStat(repository, baseCommit, tipCommit, null); + return null; } public static DiffStat getDiffStat(Repository repository, RevCommit commit) { -- Gitblit v1.9.1