From 86dca9da11d66aba2104ab64fbe3affb5ebf0ff4 Mon Sep 17 00:00:00 2001
From: Robin Rosenberg <robin.rosenberg@dewire.com>
Date: Sun, 01 Sep 2013 13:58:28 -0400
Subject: [PATCH] Don't crash with an NPE when the cache contains removed repositoried
---
src/main/java/com/gitblit/PagesServlet.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/PagesServlet.java b/src/main/java/com/gitblit/PagesServlet.java
index 1e2d311..fc71bc5 100644
--- a/src/main/java/com/gitblit/PagesServlet.java
+++ b/src/main/java/com/gitblit/PagesServlet.java
@@ -141,7 +141,6 @@
r.close();
return;
}
- response.setDateHeader("Last-Modified", JGitUtils.getCommitDate(commit).getTime());
String [] encodings = GitBlit.getEncodings();
@@ -150,8 +149,9 @@
if (StringUtils.isEmpty(resource)) {
// find resource
List<String> markdownExtensions = GitBlit.getStrings(Keys.web.markdownExtensions);
- List<String> extensions = new ArrayList<String>(markdownExtensions.size() + 1);
+ List<String> extensions = new ArrayList<String>(markdownExtensions.size() + 2);
extensions.add("html");
+ extensions.add("htm");
extensions.addAll(markdownExtensions);
for (String ext : extensions){
String file = "index." + ext;
@@ -225,6 +225,8 @@
try {
// output the content
+ response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate");
+ response.setDateHeader("Last-Modified", JGitUtils.getCommitDate(commit).getTime());
response.getOutputStream().write(content);
response.flushBuffer();
} catch (Throwable t) {
--
Gitblit v1.9.1