#291 more cleanups

testcontainers · Feb 21, 2017 · 6c5d14e · 6c5d14e
1 parent c819aba
commit 6c5d14e
Showing 1 changed file with 23 additions and 15 deletions.
diff --git a/.../src/main/java/org/testcontainers/dockerclient/NamedPipeSocketClientProviderStrategy.java b/.../src/main/java/org/testcontainers/dockerclient/NamedPipeSocketClientProviderStrategy.java
@@ -13,6 +13,7 @@
 import java.net.Socket;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
 public class NamedPipeSocketClientProviderStrategy extends DockerClientProviderStrategy {
 
@@ -85,23 +86,30 @@ InetSocketAddress start() throws IOException {
                             Socket incomingSocket = listenSocket.accept();
                             log.debug("Accepting incoming connection from {}", incomingSocket.getRemoteSocketAddress());
 
-                            RandomAccessFile randomAccessFile = new RandomAccessFile(file, "rw");
-
-                            executorService.submit(() -> {
-                                try (
-                                        InputStream in = incomingSocket.getInputStream();
-                                        FileOutputStream out = new FileOutputStream(randomAccessFile.getFD())
-                                ) {
-                                    return IOUtils.copyLarge(in, out);
-                                }
-                            });
                             executorService.submit(() -> {
-                                try (
-                                        FileInputStream in = new FileInputStream(randomAccessFile.getFD());
-                                        OutputStream out = incomingSocket.getOutputStream()
-                                ) {
-                                    return IOUtils.copyLarge(in, out);
+                                try (RandomAccessFile randomAccessFile = new RandomAccessFile(file, "rw")) {
+                                    Future<Long> inputFuture = executorService.submit(() -> {
+                                        try (
+                                                InputStream in = incomingSocket.getInputStream();
+                                                FileOutputStream out = new FileOutputStream(randomAccessFile.getFD())
+                                        ) {
+                                            return IOUtils.copyLarge(in, out);
+                                        }
+                                    });
+
+                                    Future<Long> outputFuture = executorService.submit(() -> {
+                                        try (
+                                                FileInputStream in = new FileInputStream(randomAccessFile.getFD());
+                                                OutputStream out = incomingSocket.getOutputStream()
+                                        ) {
+                                            return IOUtils.copyLarge(in, out);
+                                        }
+                                    });
+
+                                    inputFuture.get();
+                                    outputFuture.get();
                                 }
+                                return null;
                             });
 
                         } catch (IOException e) {