From: James Moger <james.moger@gitblit.com>
Date: Thu, 28 Mar 2013 20:42:12 +0000 (-0400)
Subject: Fixed internal error on folder history links (issue 192)
X-Git-Tag: v1.3.0~224
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=66a8db8f81165ea3ab5cdab0f7ca9dd3e6c20d1a;p=gitblit.git

Fixed internal error on folder history links (issue 192)
---

diff --git a/releases.moxie b/releases.moxie
index f51af67a..61e2153d 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -8,6 +8,7 @@ r17: {
     fixes:
      - Could not reset settings with $ or { characters through Gitblit Manager because they are not properly escaped
 	 - Fix NPE when getting user's fork without repository list caching (issue 182)
+	 - Fix internal error on folder history links (issue 192)
 
     additions: 
 	 - Option to force client-side basic authentication instead of form-based authentication if web.authenticateViewPages=true (issue 222)
diff --git a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
index e5878635..4d275892 100644
--- a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
@@ -109,13 +109,13 @@ public class HistoryPanel extends BasePanel {
 		}
 		
 		final boolean isTree = matchingPath == null ? true : matchingPath.isTree();
-		final boolean isSubmodule = matchingPath == null ? true : matchingPath.isSubmodule();
+		final boolean isSubmodule = matchingPath == null ? false : matchingPath.isSubmodule();
 
 		// submodule
-		SubmoduleModel submodule = getSubmodule(submodules, repositoryName, matchingPath.path);
 		final String submodulePath;
 		final boolean hasSubmodule; 
-		if (submodule != null) {
+		if (isSubmodule) {
+			SubmoduleModel submodule = getSubmodule(submodules, repositoryName, matchingPath == null ? null : matchingPath.path);
 			submodulePath = submodule.gitblitPath;
 			hasSubmodule = submodule.hasSubmodule;
 		} else {