Merge pull request #169 from gschueler/fix-input-thread-linger

Fix zombie Input Reader thread when user changes password
xebialabs · Mar 14, 2016 · d633d8d · d633d8d
2 parents ad4b8df + bcb1565
commit d633d8d
Showing 1 changed file with 7 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
@@ -201,9 +201,13 @@ public synchronized int waitFor() {
                         try {
                             outputReaderThread.join();
                         } finally {
-                            winRmClient.deleteShell();
                             closeQuietly(callersStdin);
                             processTerminated = true;
+                            try {
+                                winRmClient.deleteShell();
+                            }catch (Throwable t){
+                                logger.warn("Failure while deleting winrm shell", t);
+                            }
                         }
                         if (outputReaderThreadException[0] != null) {
                             if (outputReaderThreadException[0] instanceof RuntimeException) {
@@ -224,10 +228,10 @@ public synchronized void destroy() {
                         return;
                     }
 
-                    winRmClient.signal();
-                    winRmClient.deleteShell();
                     closeQuietly(callersStdin);
                     processTerminated = true;
+                    winRmClient.signal();
+                    winRmClient.deleteShell();
                 }
 
                 @Override