From 035e0e23f251fdb766a6630509bcf342efb8b3ad Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 29 Jun 2022 14:58:17 +0200 Subject: UploadPack: don't prematurely terminate timer in case of error In uploadWithExceptionPropagation don't prematurely terminate timer in case of error to enable reporting it to the client. Expose a close method so that callers can terminate it at the appropriate time. If the timer is already terminated when trying to report it to the client this failed with the error java.lang.IllegalStateException: "Timer already terminated". Bug: 579670 Change-Id: I95827442ccb0f9b1ede83630cf7c51cf619c399a --- .../src/org/eclipse/jgit/http/server/UploadPackServlet.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'org.eclipse.jgit.http.server/src/org') diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java index 2759b8a0fe..c4f845e52b 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java @@ -195,6 +195,8 @@ class UploadPackServlet extends HttpServlet { log(up.getRepository(), e.getCause()); consumeRequestBody(req); out.close(); + } finally { + up.close(); } }; -- cgit v1.2.3