ssh: Kill the external process when we're done instead of waiting forever

Bug: 529463
Change-Id: Iaf6fe20a1c759ac5e91a2393d7bc40a94f859e84
Signed-off-by: Carsten Pfeiffer <carsten.pfeiffer@gebit.de>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java
index bc85e6f60f5f4529734cfd957c6cde5794ae4cae..291b536184a984a77a086f420622f9884787d81d 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java
@@ -311,6 +311,9 @@ public class TransportGitSsh extends SshTransport implements PackTransport {
                public void close() {
                        endOut();
 
+                       if (process != null) {
+                               process.destroy();
+                       }
                        if (errorThread != null) {
                                try {
                                        errorThread.halt();
@@ -322,8 +325,6 @@ public class TransportGitSsh extends SshTransport implements PackTransport {
                        }
 
                        super.close();
-                       if (process != null)
-                               process.destroy();
                }
        }
 
@@ -377,6 +378,9 @@ public class TransportGitSsh extends SshTransport implements PackTransport {
                public void close() {
                        endOut();
 
+                       if (process != null) {
+                               process.destroy();
+                       }
                        if (errorThread != null) {
                                try {
                                        errorThread.halt();
@@ -388,8 +392,6 @@ public class TransportGitSsh extends SshTransport implements PackTransport {
                        }
 
                        super.close();
-                       if (process != null)
-                               process.destroy();
                }
        }
 }