From 6e4e34bb9e0620f00a820457705a0df60a1bd9c2 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Wed, 1 Jul 2015 11:24:25 -0700 Subject: Report PackProtocolExceptions to client during receive-pack We have done this since forever with the "wanted old new ref" error, so let's do it for other such errors thrown in the same block as well. Change-Id: Ib3b1c7f05e31a5b3e40e85eb07b16736920a033b --- .../src/org/eclipse/jgit/http/server/ReceivePackServlet.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'org.eclipse.jgit.http.server/src') diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackServlet.java index 41217d9971..c88670ec97 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackServlet.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackServlet.java @@ -76,6 +76,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.errors.CorruptObjectException; +import org.eclipse.jgit.errors.PackProtocolException; import org.eclipse.jgit.errors.UnpackException; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.transport.InternalHttpServerGlue; @@ -200,7 +201,7 @@ class ReceivePackServlet extends HttpServlet { consumeRequestBody(req); out.close(); - } catch (UnpackException e) { + } catch (UnpackException | PackProtocolException e) { // This should be already reported to the client. log(rp.getRepository(), e.getCause()); consumeRequestBody(req); -- cgit v1.2.3