motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-5.11' into stable-5.12 

* stable-5.11:
  Fix connection leak for smart http connections

Change-Id: I6caabf4774ccf34706cef846c1087710f67e2ecd
This commit is contained in:
Matthias Sohn 2022-06-07 11:33:38 +02:00
parent 1e59cabc08 c7335f32e9
commit 8bb17e518f
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java
View File

@ -1540,14 +1540,19 @@ class SmartHttpFetchConnection extends BasePackFetchConnection {
}
@Override
protected void doFetch(final ProgressMonitor monitor,
final Collection<Ref> want, final Set<ObjectId> have,
final OutputStream outputStream) throws TransportException {
try {
svc = new MultiRequestService(SVC_UPLOAD_PACK,
getProtocolVersion());
init(svc.getInputStream(), svc.getOutputStream());
protected void doFetch(ProgressMonitor monitor, Collection<Ref> want,
Set<ObjectId> have, OutputStream outputStream)
throws TransportException {
svc = new MultiRequestService(SVC_UPLOAD_PACK,
getProtocolVersion());
try (InputStream svcIn = svc.getInputStream();
OutputStream svcOut = svc.getOutputStream()) {
init(svcIn, svcOut);
super.doFetch(monitor, want, have, outputStream);
} catch (TransportException e) {
throw e;
} catch (IOException e) {
throw new TransportException(e.getMessage(), e);
} finally {
svc = null;
}
@ -1571,13 +1576,20 @@ class SmartHttpPushConnection extends BasePackPushConnection {
}
@Override
protected void doPush(final ProgressMonitor monitor,
final Map<String, RemoteRefUpdate> refUpdates,
protected void doPush(ProgressMonitor monitor,
Map<String, RemoteRefUpdate> refUpdates,
OutputStream outputStream) throws TransportException {
final Service svc = new MultiRequestService(SVC_RECEIVE_PACK,
Service svc = new MultiRequestService(SVC_RECEIVE_PACK,
getProtocolVersion());
init(svc.getInputStream(), svc.getOutputStream());
super.doPush(monitor, refUpdates, outputStream);
try (InputStream svcIn = svc.getInputStream();
OutputStream svcOut = svc.getOutputStream()) {
init(svcIn, svcOut);
super.doPush(monitor, refUpdates, outputStream);
} catch (TransportException e) {
throw e;
} catch (IOException e) {
throw new TransportException(e.getMessage(), e);
}
}
}