summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.http.server
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2022-07-06 17:02:58 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2022-07-06 17:02:58 +0200
commitf6935d8cd2e00d5923917ff869354e443da66014 (patch)
tree825ce60a7e6327761163c0e306901c1800d750d5 /org.eclipse.jgit.http.server
parent99293bbc029cdccf6d70b037e29b5c08c5a36707 (diff)
parent34600e3ca23262ed67555d147fa46892b5a5e67b (diff)
downloadjgit-f6935d8cd2e00d5923917ff869354e443da66014.tar.gz
jgit-f6935d8cd2e00d5923917ff869354e443da66014.zip
Merge branch 'stable-6.2'
* stable-6.2: 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: Ia2280b848cea7bdfa5bc48356484e040d159845d
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();
}
};