aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.http.server
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2022-07-06 17:01:03 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2022-07-06 17:02:04 +0200
commit34600e3ca23262ed67555d147fa46892b5a5e67b (patch)
treed1c4362d9df0bf05a27ea7918cfea7da5a58b9c4 /org.eclipse.jgit.http.server
parent58f5302e1d8c1c7a4111c141bea0533c41129a74 (diff)
parentd01376106af8800017ac3c08d7c7ac1fd5ccc9ee (diff)
downloadjgit-34600e3ca23262ed67555d147fa46892b5a5e67b.tar.gz
jgit-34600e3ca23262ed67555d147fa46892b5a5e67b.zip
Merge branch 'stable-6.1' into stable-6.2
* stable-6.1: UploadPack: don't prematurely terminate timer in case of error Do not create reflog for remote tracking branches during clone UploadPack: do not check reachability of visible SHA1s Add missing package import javax.management to org.eclipse.jgit Change-Id: Ib3ff6a038e1b92a931a7f2624c19bbefd8cb95fd
Diffstat (limited to 'org.eclipse.jgit.http.server')
-rw-r--r--org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java2
1 files changed, 2 insertions, 0 deletions
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 d3437b7eb9..23a398f9db 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
@@ -208,6 +208,8 @@ class UploadPackServlet extends HttpServlet {
log(up.getRepository(), e.getCause());
consumeRequestBody(req);
out.close();
+ } finally {
+ up.close();
}
};