wip

marcuslinke · marcuslinke · commit 4d911d41a7cb · 2016-09-05T20:48:43.000+02:00
diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -264,6 +264,7 @@ public void run() {
                     }
 
                     // we close the writing side of the socket, but keep the read side open to transfer stdout/stderr
+                    System.out.println("shutdownOutput");
                     channel.shutdownOutput();
 
                 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
@@ -137,8 +137,9 @@ public void execStartAttachStdin() throws Exception {
                 .exec(new ExecStartResultCallback(stdout, System.err))
                 .awaitCompletion(5, TimeUnit.SECONDS);
 
-        assertTrue(completed, "The process was not finished.");
         assertEquals(stdout.toString("UTF-8"), "STDIN\n");
+        assertTrue(completed, "The process was not finished.");
+        
     }
 
     @Test()
@@ -156,7 +157,7 @@ public void execStartAttachStdinToShell() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        InputStream stdin = new ByteArrayInputStream("ls\n".getBytes());
+        InputStream stdin = new ByteArrayInputStream("ls\nexit\n".getBytes());
 
         ByteArrayOutputStream stdout = new ByteArrayOutputStream();
 
@@ -201,8 +202,9 @@ public void execStartNotAttachedStdin() throws Exception {
                 .exec(new ExecStartResultCallback(stdout, System.err))
                 .awaitCompletion(5, TimeUnit.SECONDS);
 
+        assertEquals(stdout.toString(), "");
         // with v1.22 of the remote api the server closed the connection when no stdin was attached while exec create, so completed was true
         assertFalse(completed, "The process was not finished.");
-        assertEquals(stdout.toString(), "");
+        
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -264,6 +264,7 @@ public void run() {`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`// we close the writing side of the socket, but keep the read side open to transfer stdout/stderr`
	`267`	`+ System.out.println("shutdownOutput");`
`267`	`268`	`channel.shutdownOutput();`
`268`	`269`
`269`	`270`	`}`