summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.http.server
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2022-07-06 10:38:30 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2022-07-06 16:59:30 +0200
commit9f7d77b608c384669811772760591329890f19b7 (patch)
tree525403e7994fd3da0e87009f7d7330d0b8f6d9e2 /org.eclipse.jgit.http.server
parentd961bb65024815996d82094cacaba811bf5eab85 (diff)
parent035e0e23f251fdb766a6630509bcf342efb8b3ad (diff)
downloadjgit-9f7d77b608c384669811772760591329890f19b7.tar.gz
jgit-9f7d77b608c384669811772760591329890f19b7.zip
Merge branch 'stable-5.13' into stable-6.0
* stable-5.13: 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: I6db0a4d74399fde892eeec62efd2946f97547a5d
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 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();
}
};