From 1dcfd2e983489e3f6c318e1d30ae59c925349fbc Mon Sep 17 00:00:00 2001
From: Yuhi Ishikura <yuhi.ishikura@gmail.com>
Date: Sun, 02 Jun 2013 10:44:03 -0400
Subject: [PATCH] Fixed problem that PagesServlet couldn't provide index.htm and index.mkd.
---
src/main/java/com/gitblit/PagesServlet.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/PagesServlet.java b/src/main/java/com/gitblit/PagesServlet.java
index 91f25b7..34fe10d 100644
--- a/src/main/java/com/gitblit/PagesServlet.java
+++ b/src/main/java/com/gitblit/PagesServlet.java
@@ -149,8 +149,11 @@
// find resource
String[] files = { "index.html", "index.htm", "index.mkd" };
for (String file : files) {
- content = JGitUtils.getStringContent(r, tree, file, encodings)
- .getBytes(Constants.ENCODING);
+ String stringContent = JGitUtils.getStringContent(r, tree, file, encodings);
+ if(stringContent == null){
+ continue;
+ }
+ content = stringContent.getBytes(Constants.ENCODING);
if (content != null) {
resource = file;
// assume text/html unless the servlet container
--
Gitblit v1.9.1