Fixed submodule npe in compare page

2 files changed, 8 insertions, 2 deletions

diff --git a/src/main/java/com/gitblit/wicket/pages/ComparePage.java b/src/main/java/com/gitblit/wicket/pages/ComparePage.java
index f62dc649..f5f35263 100644
--- a/src/main/java/com/gitblit/wicket/pages/ComparePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ComparePage.java
@@ -103,6 +103,9 @@ public class ComparePage extends RepositoryPage {
 				toCommit = getCommit(r, toCommitId.getObject());
 			}
 
+			// prepare submodules
+			getSubmodules(toCommit);
+			
 			final String startId = fromCommit.getId().getName();
 			final String endId = toCommit.getId().getName();
 
diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
index 8a233ead..072475a0 100644
--- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
@@ -339,7 +339,7 @@ public abstract class RepositoryPage extends RootPage {
 		return commit;

 	}

 	

-	private Map<String, SubmoduleModel> getSubmodules(RevCommit commit) {	

+	protected Map<String, SubmoduleModel> getSubmodules(RevCommit commit) {	

 		if (submodules == null) {

 			submodules = new HashMap<String, SubmoduleModel>();

 			for (SubmoduleModel model : JGitUtils.getSubmodules(r, commit.getTree())) {

@@ -350,7 +350,10 @@ public abstract class RepositoryPage extends RootPage {
 	}

 	

 	protected SubmoduleModel getSubmodule(String path) {

-		SubmoduleModel model = submodules.get(path);

+		SubmoduleModel model = null;

+		if (submodules != null) {

+			model = submodules.get(path);

+		}

 		if (model == null) {

 			// undefined submodule?!

 			model = new SubmoduleModel(path.substring(path.lastIndexOf('/') + 1), path, path);