Fixed internal error on folder history links (issue 192)

diff --git a/releases.moxie b/releases.moxie
index f51af67a5cefd67d4c26cef254b9a97e5f723e2a..61e2153d383087f9a304b6e6b87bc0fc178422d0 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -8,6 +8,7 @@ r17: {
     fixes:\r
      - Could not reset settings with $ or { characters through Gitblit Manager because they are not properly escaped\r
         - Fix NPE when getting user's fork without repository list caching (issue 182)\r
+        - Fix internal error on folder history links (issue 192)\r
 \r
     additions: \r
         - Option to force client-side basic authentication instead of form-based authentication if web.authenticateViewPages=true (issue 222)\r

diff --git a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
index e5878635ed706b5ce694aec33bb7b006cebf095d..4d275892706b7abad20d0b966988dbf903e350e6 100644 (file)
--- 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 {
                }\r
                \r
                final boolean isTree = matchingPath == null ? true : matchingPath.isTree();\r
-               final boolean isSubmodule = matchingPath == null ? true : matchingPath.isSubmodule();\r
+               final boolean isSubmodule = matchingPath == null ? false : matchingPath.isSubmodule();\r
 \r
                // submodule\r
-               SubmoduleModel submodule = getSubmodule(submodules, repositoryName, matchingPath.path);\r
                final String submodulePath;\r
                final boolean hasSubmodule; \r
-               if (submodule != null) {\r
+               if (isSubmodule) {\r
+                       SubmoduleModel submodule = getSubmodule(submodules, repositoryName, matchingPath == null ? null : matchingPath.path);\r
                        submodulePath = submodule.gitblitPath;\r
                        hasSubmodule = submodule.hasSubmodule;\r
                } else {\r