Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Grunberg2015-09-29 14:39:32 +0000
committerRoland Grunberg2015-09-29 15:32:07 +0000
commite8a8d0d58e5cb626774884ee6c8059be9c484013 (patch)
tree63d40b987cf85313e04016754472df038c925caa /containers/org.eclipse.linuxtools.docker.core/src/org/eclipse
parent2dd8f1ccbc22fc8af0924ee7dbe24af55d5a496e (diff)
downloadorg.eclipse.linuxtools-e8a8d0d58e5cb626774884ee6c8059be9c484013.tar.gz
org.eclipse.linuxtools-e8a8d0d58e5cb626774884ee6c8059be9c484013.tar.xz
org.eclipse.linuxtools-e8a8d0d58e5cb626774884ee6c8059be9c484013.zip
Continue to respect JavaSE-1.7 for core and ui bundles.
Change-Id: Ie4ea86e1731ac0bc360db8c9282fb003144e19a6 Reviewed-on: https://git.eclipse.org/r/56959 Tested-by: Hudson CI Reviewed-by: Roland Grunberg <rgrunber@redhat.com>
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/DockerMachine.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerMachine.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerMachine.java
index 694b9c7eca..3da6905613 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerMachine.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerMachine.java
@@ -16,7 +16,6 @@ import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.concurrent.TimeUnit;
public class DockerMachine {
@@ -57,7 +56,7 @@ public class DockerMachine {
cmd.addAll(Arrays.asList(args));
Process p = Runtime.getRuntime().exec(cmd.toArray(new String[0]));
BufferedReader buff = new BufferedReader(new InputStreamReader(p.getInputStream()));
- if (p.waitFor(5, TimeUnit.SECONDS) && p.exitValue() == 0) {
+ if (p.waitFor() == 0) {
String line;
while ((line = buff.readLine()) != null) {
result.add(line);

Back to the top