From 4640f1b689684b805f08a5a937e91dfc65ae977f Mon Sep 17 00:00:00 2001
From: Hybris95 <hybris_95@hotmail.com>
Date: Thu, 01 May 2014 16:14:14 -0400
Subject: [PATCH] Now only shows the "my tickets" button in the navbar if you are connected. Redirects to the main page if you try going on "/mytickets" when not connected (or if you disconnect while being on "/mytickets").
---
src/main/java/com/gitblit/utils/JGitUtils.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/utils/JGitUtils.java b/src/main/java/com/gitblit/utils/JGitUtils.java
index c6526c2..190872a 100644
--- a/src/main/java/com/gitblit/utils/JGitUtils.java
+++ b/src/main/java/com/gitblit/utils/JGitUtils.java
@@ -711,7 +711,7 @@
try {
// resolve object id
ObjectId branchObject;
- if (StringUtils.isEmpty(objectId)) {
+ if (StringUtils.isEmpty(objectId) || "HEAD".equalsIgnoreCase(objectId)) {
branchObject = getDefaultBranch(repository);
} else {
branchObject = repository.resolve(objectId);
@@ -2256,8 +2256,10 @@
}
} 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 @@
}
} catch (IOException e) {
LOGGER.error("Failed to merge", e);
- } finally {
- revWalk.release();
+ } finally {
+ if (revWalk != null) {
+ revWalk.release();
+ }
}
return new MergeResult(MergeStatus.FAILED, null);
}
--
Gitblit v1.9.1