Closing stdin stream so that the WinRM input reader thread stops when…

… the process completes (fixes #87).
xebialabs · Feb 22, 2014 · 7c733bc · 7c733bc
1 parent 21ffb52
commit 7c733bc
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/com/xebialabs/overthere/cifs/winrm/CifsWinRmConnection.java b/src/main/java/com/xebialabs/overthere/cifs/winrm/CifsWinRmConnection.java
@@ -111,8 +111,8 @@ public OverthereProcess startProcess(final CmdLine cmd) {
 
         final WinRmClient winRmClient = createWinrmClient();
         try {
-            final PipedInputStream toCallersStdin = new PipedInputStream();
-            final PipedOutputStream callersStdin = new PipedOutputStream(toCallersStdin);
+            final PipedInputStream fromCallersStdin = new PipedInputStream();
+            final PipedOutputStream callersStdin = new PipedOutputStream(fromCallersStdin);
             final PipedInputStream callersStdout = new PipedInputStream();
             final PipedOutputStream toCallersStdout = new PipedOutputStream(callersStdout);
             final PipedInputStream callersStderr = new PipedInputStream();
@@ -128,7 +128,7 @@ public void run() {
                     try {
                         byte[] buf = new byte[STDIN_BUF_SIZE];
                         for (; ; ) {
-                            int n = toCallersStdin.read(buf);
+                            int n = fromCallersStdin.read(buf);
                             if (n == -1)
                                 break;
                             if (n == 0)
@@ -197,6 +197,7 @@ public synchronized int waitFor() {
                             outputReaderThread.join();
                         } finally {
                             winRmClient.deleteShell();
+                            closeQuietly(callersStdin);
                             processTerminated = true;
                         }
                         if (outputReaderThreadException[0] != null) {
@@ -220,6 +221,7 @@ public synchronized void destroy() {
 
                     winRmClient.signal();
                     winRmClient.deleteShell();
+                    closeQuietly(callersStdin);
                     processTerminated = true;
                 }