From 2a7306a1d92522569a8bb6e5a7c0bcdd5cf4cfaa Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 26 May 2011 17:11:38 -0400
Subject: [PATCH] Findbugs. CodePro Audit. Checkstyle. Unit test refactoring.
---
src/com/gitblit/wicket/pages/PatchPage.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/PatchPage.java b/src/com/gitblit/wicket/pages/PatchPage.java
index 9d032ca..02e4d38 100644
--- a/src/com/gitblit/wicket/pages/PatchPage.java
+++ b/src/com/gitblit/wicket/pages/PatchPage.java
@@ -37,7 +37,7 @@
redirectToInterceptPage(new RepositoriesPage());
return;
}
-
+
final String repositoryName = WicketUtils.getRepositoryName(params);
final String baseObjectId = WicketUtils.getBaseObjectId(params);
final String objectId = WicketUtils.getObject(params);
@@ -56,14 +56,12 @@
redirectToInterceptPage(new RepositoriesPage());
return;
}
-
- String patch;
- if (StringUtils.isEmpty(baseObjectId)) {
- patch = JGitUtils.getCommitPatch(r, commit, blobPath);
- } else {
- RevCommit baseCommit = JGitUtils.getCommit(r, baseObjectId);
- patch = JGitUtils.getCommitPatch(r, baseCommit, commit, blobPath);
+
+ RevCommit baseCommit = null;
+ if (!StringUtils.isEmpty(baseObjectId)) {
+ baseCommit = JGitUtils.getCommit(r, baseObjectId);
}
+ String patch = JGitUtils.getCommitPatch(r, baseCommit, commit, blobPath);
add(new Label("patchText", patch));
r.close();
}
--
Gitblit v1.9.1