Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Grunberg2015-11-20 15:20:45 +0000
committerRoland Grunberg2015-11-23 15:30:57 +0000
commit727d121f1b0ce416ca00a634a2192ff8f75c6095 (patch)
tree64d256e658e95c4ce339b4534277722ae08e38bc /containers/org.eclipse.linuxtools.docker.core/src/org/eclipse
parent67af2cf84c9672e52906fd633b7921680faab5ed (diff)
downloadorg.eclipse.linuxtools-727d121f1b0ce416ca00a634a2192ff8f75c6095.tar.gz
org.eclipse.linuxtools-727d121f1b0ce416ca00a634a2192ff8f75c6095.tar.xz
org.eclipse.linuxtools-727d121f1b0ce416ca00a634a2192ff8f75c6095.zip
Bug 471671: Start using com.spotify.docker.client 3.1.10.
- Remove workarounds for reconnecting when a SocketTimeout is hit. - Implement proper validation for container refresh preference option. Change-Id: I277d1cd6b2663d25b44de4ee42897592b8367605 Reviewed-on: https://git.eclipse.org/r/60948 Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> Tested-by: Hudson CI
Diffstat (limited to 'containers/org.eclipse.linuxtools.docker.core/src/org/eclipse')
-rw-r--r--containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java11
1 files changed, 1 insertions, 10 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
index 209a2183fc..57fc86cee1 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
@@ -15,7 +15,6 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.net.SocketTimeoutException;
import java.net.URI;
import java.nio.ByteBuffer;
import java.nio.channels.WritableByteChannel;
@@ -514,15 +513,7 @@ public class DockerConnection implements IDockerConnection, Closeable {
Activator.logErrorMessage(e.getMessage());
throw new InterruptedException();
} catch (Exception e) {
- /*
- * Temporary workaround for BZ #477485
- * Remove when docker-client logs() uses noTimeoutClient.
- */
- if (e.getCause() instanceof SocketTimeoutException) {
- execute();
- } else {
- Activator.logErrorMessage(e.getMessage());
- }
+ Activator.logErrorMessage(e.getMessage());
} finally {
follow = false;
copyClient.close(); // we are done with copyClient..dispose

Back to the top