Yuhi Ishikura
2013-06-02 7eb9828ec6a31ad372c6a1dac7fa042bcdbd6818
Improve index page strategy in PagesServlet.
1 files modified
10 ■■■■ changed files
src/main/java/com/gitblit/PagesServlet.java 10 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/PagesServlet.java
@@ -18,6 +18,8 @@
import java.io.IOException;
import java.text.MessageFormat;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -147,8 +149,12 @@
            byte[] content = null;
            if (StringUtils.isEmpty(resource)) {
                // find resource
                String[] files = { "index.html", "index.htm", "index.mkd" };
                for (String file : files) {
                List<String> markdownExtensions = GitBlit.getStrings(Keys.web.markdownExtensions);
                List<String> extensions = new ArrayList<String>(markdownExtensions.size() + 1);
                extensions.add("html");
                extensions.addAll(markdownExtensions);
                for (String ext : extensions){
                    String file = "index." + ext;
                    String stringContent = JGitUtils.getStringContent(r, tree, file, encodings);
                    if(stringContent == null){
                        continue;