From 4a5a55229bf066bf933dde6cb6f51a4378d67fb7 Mon Sep 17 00:00:00 2001
From: John Crygier <john.crygier@aon.com>
Date: Fri, 04 May 2012 09:50:22 -0400
Subject: [PATCH] Change techique for custom properties to fall in line with reading / writing of all other properties
---
src/com/gitblit/DownloadZipServlet.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/DownloadZipServlet.java b/src/com/gitblit/DownloadZipServlet.java
index ed3aa55..209272f 100644
--- a/src/com/gitblit/DownloadZipServlet.java
+++ b/src/com/gitblit/DownloadZipServlet.java
@@ -15,8 +15,12 @@
*/
package com.gitblit;
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.text.ParseException;
import java.util.Date;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletResponse;
@@ -26,6 +30,7 @@
import org.slf4j.LoggerFactory;
import com.gitblit.utils.JGitUtils;
+import com.gitblit.utils.MarkdownUtils;
import com.gitblit.utils.StringUtils;
/**
@@ -79,7 +84,7 @@
response.sendError(HttpServletResponse.SC_FORBIDDEN);
return;
}
-
+
String repository = request.getParameter("r");
String basePath = request.getParameter("p");
String objectId = request.getParameter("h");
@@ -98,8 +103,18 @@
}
Repository r = GitBlit.self().getRepository(repository);
+ if (r == null) {
+ error(response, MessageFormat.format("# Error\nFailed to find repository {0}", repository));
+ return;
+ }
RevCommit commit = JGitUtils.getCommit(r, objectId);
+ if (commit == null) {
+ error(response, MessageFormat.format("# Error\nFailed to find commit {0}", objectId));
+ r.close();
+ return;
+ }
Date date = JGitUtils.getCommitDate(commit);
+
String contentType = "application/octet-stream";
response.setContentType(contentType + "; charset=" + response.getCharacterEncoding());
response.setHeader("Content-Disposition", "attachment; filename=\"" + name + ".zip"
@@ -115,11 +130,21 @@
} catch (Throwable t) {
logger.error("Failed to write attachment to client", t);
}
+
+ // close the repository
+ r.close();
} catch (Throwable t) {
logger.error("Failed to write attachment to client", t);
}
}
+ private void error(HttpServletResponse response, String mkd) throws ServletException,
+ IOException, ParseException {
+ String content = MarkdownUtils.transformMarkdown(mkd);
+ response.setContentType("text/html; charset=" + Constants.ENCODING);
+ response.getWriter().write(content);
+ }
+
@Override
protected void doPost(javax.servlet.http.HttpServletRequest request,
javax.servlet.http.HttpServletResponse response) throws javax.servlet.ServletException,
--
Gitblit v1.9.1