James Moger
2013-06-26 61555b59c56aa913b669e26daab963a57349423c
Fixed last modified caching for logo servlet
1 files modified
4 ■■■■ changed files
src/main/java/com/gitblit/LogoServlet.java 4 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/LogoServlet.java
@@ -47,7 +47,7 @@
    protected long getLastModified(HttpServletRequest req) {
        File file = GitBlit.getFileOrFolder(Keys.web.headerLogo, "${baseFolder}/logo.png");
        if (file.exists()) {
            return file.lastModified();
            return Math.max(lastModified, file.lastModified());
        } else {
            return lastModified;
        }
@@ -65,7 +65,7 @@
                ServletContext context = request.getSession().getServletContext();
                contentType = context.getMimeType(file.getName());
                response.setContentLength((int) file.length());
                response.setDateHeader("Last-Modified", file.lastModified());
                response.setDateHeader("Last-Modified", Math.max(lastModified, file.lastModified()));
                is = new FileInputStream(file);
            } else {
                // default logo