Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSnjezana Peco2018-02-07 23:36:05 +0000
committerSnjezana Peco2018-02-14 15:53:07 +0000
commit8f52b072885970b7321fd396fea20ede612d8543 (patch)
treedaaa48698a5a445bd7e6e82fdfee65230daabaab /org.eclipse.m2e.core
parentb30a99574264e9cdb065f991206d48d5fc959b90 (diff)
downloadm2e-core-8f52b072885970b7321fd396fea20ede612d8543.tar.gz
m2e-core-8f52b072885970b7321fd396fea20ede612d8543.tar.xz
m2e-core-8f52b072885970b7321fd396fea20ede612d8543.zip
Bug 531151: update aether-connector-okhttp to fix connection leaks
Change-Id: I519156d226cec45397b2cdf9d056703933e1ef87 Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com>
Diffstat (limited to 'org.eclipse.m2e.core')
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java28
1 files changed, 10 insertions, 18 deletions
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java
index 6f167dd9..cf2767c5 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java
@@ -11,13 +11,6 @@
package org.eclipse.m2e.core.internal.index.nexus;
-import io.takari.aether.client.AetherClient;
-import io.takari.aether.client.AetherClientAuthentication;
-import io.takari.aether.client.AetherClientConfig;
-import io.takari.aether.client.AetherClientProxy;
-import io.takari.aether.client.Response;
-import io.takari.aether.okhttp.OkHttpAetherClient;
-
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
@@ -28,8 +21,6 @@ import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;
-import com.google.common.io.Closer;
-
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
@@ -40,6 +31,13 @@ import org.apache.maven.wagon.proxy.ProxyInfo;
import org.eclipse.m2e.core.internal.MavenPluginActivator;
+import io.takari.aether.client.AetherClient;
+import io.takari.aether.client.AetherClientAuthentication;
+import io.takari.aether.client.AetherClientConfig;
+import io.takari.aether.client.AetherClientProxy;
+import io.takari.aether.client.Response;
+import io.takari.aether.okhttp.OkHttpAetherClient;
+
public class AetherClientResourceFetcher extends AbstractResourceFetcher {
@@ -74,14 +72,10 @@ public class AetherClientResourceFetcher extends AbstractResourceFetcher {
}
public void retrieve(String name, File targetFile) throws IOException, FileNotFoundException {
-
String url = baseUrl + "/" + name;
- Response response = aetherClient.get(url);
-
- Closer closer = Closer.create();
- try {
- InputStream is = closer.register(response.getInputStream());
- OutputStream os = closer.register(new BufferedOutputStream(new FileOutputStream(targetFile)));
+ try (Response response = aetherClient.get(url);
+ InputStream is = response.getInputStream();
+ OutputStream os = new BufferedOutputStream(new FileOutputStream(targetFile))) {
final byte[] buffer = new byte[1024 * 1024];
int n = 0;
while(-1 != (n = is.read(buffer))) {
@@ -90,8 +84,6 @@ public class AetherClientResourceFetcher extends AbstractResourceFetcher {
throw new OperationCanceledException();
}
}
- } finally {
- closer.close();
}
}

Back to the top