From ffbe03aa9b0e1e3b0bbb44baeab34d39cf09bb23 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 19 Aug 2016 11:29:00 +0900 Subject: LfsProtocolServlet: Add support for insufficient storage error Since [1], the git-lfs specification allows the server to return HTTP 507 if there is insufficient storage for the uploaded object(s). Add a new exception class, which implementations may throw from the getRepository() method, causing HTTP 507 to be returned to the client. [1] https://github.com/github/git-lfs/pull/1473 Change-Id: If5bc0a35fcf870d4216af6ca2f7c8924689ef9c5 Signed-off-by: David Pursehouse --- .../src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'org.eclipse.jgit.lfs.server') diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java index d335b720bd..b0736bbc29 100644 --- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java +++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java @@ -44,6 +44,7 @@ package org.eclipse.jgit.lfs.server; import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.http.HttpStatus.SC_FORBIDDEN; +import static org.apache.http.HttpStatus.SC_INSUFFICIENT_STORAGE; import static org.apache.http.HttpStatus.SC_NOT_FOUND; import static org.apache.http.HttpStatus.SC_OK; import static org.apache.http.HttpStatus.SC_SERVICE_UNAVAILABLE; @@ -65,6 +66,7 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.lfs.errors.LfsBandwidthLimitExceeded; import org.eclipse.jgit.lfs.errors.LfsException; +import org.eclipse.jgit.lfs.errors.LfsInsufficientStorage; import org.eclipse.jgit.lfs.errors.LfsRateLimitExceeded; import org.eclipse.jgit.lfs.errors.LfsRepositoryNotFound; import org.eclipse.jgit.lfs.errors.LfsRepositoryReadOnly; @@ -173,6 +175,8 @@ public abstract class LfsProtocolServlet extends HttpServlet { sendError(res, w, SC_RATE_LIMIT_EXCEEDED, e.getMessage()); } catch (LfsBandwidthLimitExceeded e) { sendError(res, w, SC_BANDWIDTH_LIMIT_EXCEEDED, e.getMessage()); + } catch (LfsInsufficientStorage e) { + sendError(res, w, SC_INSUFFICIENT_STORAGE, e.getMessage()); } catch (LfsException e) { sendError(res, w, SC_SERVICE_UNAVAILABLE, e.getMessage()); } finally { -- cgit v1.2.3