diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2022-07-06 17:00:09 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2022-07-06 17:00:42 +0200 |
| commit | d01376106af8800017ac3c08d7c7ac1fd5ccc9ee (patch) | |
| tree | 16238b82a84394eef5fb6a599777432c235f774b /org.eclipse.jgit.http.server | |
| parent | d0bc2b544a71e4150bfb31d0f0c9348ac076499b (diff) | |
| parent | 9f7d77b608c384669811772760591329890f19b7 (diff) | |
| download | jgit-d01376106af8800017ac3c08d7c7ac1fd5ccc9ee.tar.gz jgit-d01376106af8800017ac3c08d7c7ac1fd5ccc9ee.zip | |
Merge branch 'stable-6.0' into stable-6.1
* stable-6.0:
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: I08734ee2c8f3296d908da6a29d53ed87c4b48eb2
Diffstat (limited to 'org.eclipse.jgit.http.server')
| -rw-r--r-- | org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java | 2 |
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(); } }; |