From 6fce727aca709a9940de0f2eac419b4791c3bf9a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 30 Sep 2014 08:06:58 -0400
Subject: [PATCH] Merged #194 "Register BouncyCastle as a JCE provider"
---
src/main/java/com/gitblit/wicket/pages/RepositoryPage.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
index b3250a6..134ee04 100644
--- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
@@ -201,11 +201,13 @@
objectParams = params;
// preserve the objectid iff the objectid directly (or indirectly) refers to a ref
- if (!StringUtils.isEmpty(objectId)) {
+ if (isCommitPage() && !StringUtils.isEmpty(objectId)) {
RevCommit commit = JGitUtils.getCommit(r, objectId);
- String bestId = getBestCommitId(commit);
- if (!commit.getName().equals(bestId)) {
- objectParams = WicketUtils.newObjectParameter(getRepositoryName(), bestId);
+ if (commit != null) {
+ String bestId = getBestCommitId(commit);
+ if (!commit.getName().equals(bestId)) {
+ objectParams = WicketUtils.newObjectParameter(getRepositoryName(), bestId);
+ }
}
}
}
@@ -574,6 +576,10 @@
protected abstract String getPageName();
+ protected boolean isCommitPage() {
+ return false;
+ }
+
protected Component createPersonPanel(String wicketId, PersonIdent identity,
Constants.SearchType searchType) {
String name = identity == null ? "" : identity.getName();
--
Gitblit v1.9.1