motiejus
/
jgit
1
Fork 0
Code Releases Activity

UploadPackServlet#doPost use try-with-resource to ensure up is closed 

Change-Id: Iadbf81f183bb94f3b00b9940f065586b13e85c95
This commit is contained in:
Matthias Sohn 2022-11-20 21:13:50 +01:00
parent cddff2b7fd
commit 3e72816629
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java
View File

@ -168,42 +168,43 @@ public void doPost(HttpServletRequest req, HttpServletResponse rsp)
}
UploadPackRunnable r = () -> {
UploadPack up = (UploadPack) req.getAttribute(ATTRIBUTE_HANDLER);
// to be explicitly closed by caller
@SuppressWarnings("resource")
SmartOutputStream out = new SmartOutputStream(req, rsp, false) {
@Override
public void flush() throws IOException {
doFlush();
}
};
up.setBiDirectionalPipe(false);
rsp.setContentType(UPLOAD_PACK_RESULT_TYPE);
try {
up.uploadWithExceptionPropagation(getInputStream(req), out,
null);
out.close();
} catch (ServiceMayNotContinueException e) {
if (e.isOutput()) {
consumeRequestBody(req);
out.close();
}
throw e;
} catch (UploadPackInternalServerErrorException e) {
// Special case exception, error message was sent to client.
log(up.getRepository(), e.getCause());
consumeRequestBody(req);
out.close();
} finally {
up.close();
}
upload(req, rsp);
};
handler.upload(req, rsp, r);
}
private void upload(HttpServletRequest req, HttpServletResponse rsp)
throws IOException, ServiceMayNotContinueException {
// to be explicitly closed by caller
@SuppressWarnings("resource")
SmartOutputStream out = new SmartOutputStream(req, rsp, false) {
@Override
public void flush() throws IOException {
doFlush();
}
};
Repository repo = null;
try (UploadPack up = (UploadPack) req.getAttribute(ATTRIBUTE_HANDLER)) {
up.setBiDirectionalPipe(false);
rsp.setContentType(UPLOAD_PACK_RESULT_TYPE);
repo = up.getRepository();
up.uploadWithExceptionPropagation(getInputStream(req), out, null);
out.close();
} catch (ServiceMayNotContinueException e) {
if (e.isOutput()) {
consumeRequestBody(req);
out.close();
}
throw e;
} catch (UploadPackInternalServerErrorException e) {
// Special case exception, error message was sent to client.
log(repo, e.getCause());
consumeRequestBody(req);
out.close();
}
}
private void defaultUploadPackHandler(HttpServletRequest req,
HttpServletResponse rsp, UploadPackRunnable r) throws IOException {
try {