Terminate StreamCopy threads in case of errors

Bug: 513554
Change-Id: I065836b8fc77ade6de92e4a809fcf770a4f793ec
Signed-off-by: Dmitry Neverov <dmitry.neverov@gmail.com>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/JschSession.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/JschSession.java
index 82d6ed4e48437f6b60a9b525a4313b6468db518c..a8cc03200615d14faba5df96fb3c75595f4e3a11 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/JschSession.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/JschSession.java
@@ -220,6 +220,7 @@ public class JschSession implements RemoteSession {
                public void destroy() {
                        if (channel.isConnected())
                                channel.disconnect();
+                       closeOutputStream();
                }
 
                @Override

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 9a40f47cb773321d5956337b37e49c0a6ef233b6..ede5a7ae3386eeecbc3b212e0a65baa8a242bff5 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java
@@ -283,12 +283,12 @@ public class TransportGitSsh extends SshTransport implements PackTransport {
                                init(process.getInputStream(), process.getOutputStream());
 
                        } catch (TransportException err) {
-                               close();
                                throw err;
-                       } catch (IOException err) {
-                               close();
+                       } catch (Throwable err) {
                                throw new TransportException(uri,
                                                JGitText.get().remoteHungUpUnexpectedly, err);
+                       } finally {
+                               close();
                        }
 
                        try {
@@ -341,12 +341,12 @@ public class TransportGitSsh extends SshTransport implements PackTransport {
                                init(process.getInputStream(), process.getOutputStream());
 
                        } catch (TransportException err) {
-                               close();
                                throw err;
-                       } catch (IOException err) {
-                               close();
+                       } catch (Throwable err) {
                                throw new TransportException(uri,
                                                JGitText.get().remoteHungUpUnexpectedly, err);
+                       } finally {
+                               close();
                        }
 
                        try {