Merged #113 "Internal error on entering the blob page url without specifying a path"

1 files changed, 5 insertions, 0 deletions

diff --git a/src/main/java/com/gitblit/wicket/pages/BlobPage.java b/src/main/java/com/gitblit/wicket/pages/BlobPage.java
index f3d0bc92..0938fcde 100644
--- a/src/main/java/com/gitblit/wicket/pages/BlobPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BlobPage.java
@@ -21,6 +21,7 @@ import java.util.Map;
 

 import org.apache.wicket.Component;

 import org.apache.wicket.PageParameters;

+import org.apache.wicket.RedirectException;

 import org.apache.wicket.markup.html.basic.Label;

 import org.apache.wicket.markup.html.image.Image;

 import org.apache.wicket.markup.html.link.BookmarkablePageLink;

@@ -52,6 +53,10 @@ public class BlobPage extends RepositoryPage {
 		final String blobPath = WicketUtils.getPath(params);

 		String [] encodings = getEncodings();

 

+		if (StringUtils.isEmpty(objectId) && StringUtils.isEmpty(blobPath)) {

+			throw new RedirectException(TreePage.class, WicketUtils.newRepositoryParameter(repositoryName));

+		}

+

 		if (StringUtils.isEmpty(blobPath)) {

 			// blob by objectid