From 1dcfd2e983489e3f6c318e1d30ae59c925349fbc Mon Sep 17 00:00:00 2001 From: Yuhi Ishikura Date: Sun, 2 Jun 2013 23:44:00 +0900 Subject: [PATCH] Fixed problem that PagesServlet couldn't provide index.htm and index.mkd. --- src/main/java/com/gitblit/PagesServlet.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gitblit/PagesServlet.java b/src/main/java/com/gitblit/PagesServlet.java index 91f25b70..34fe10d3 100644 --- a/src/main/java/com/gitblit/PagesServlet.java +++ b/src/main/java/com/gitblit/PagesServlet.java @@ -149,8 +149,11 @@ public class PagesServlet extends HttpServlet { // 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 -- 2.39.5