motiejus
/
jgit
1
Fork 0
Code Releases Activity

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>
This commit is contained in:
Carsten Pfeiffer 2018-05-02 17:40:30 +02:00
parent 0a35e5f25b
commit 34bcb255ef
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java
View File

@ -311,6 +311,9 @@ class SshFetchConnection extends BasePackFetchConnection {
public void close() {
endOut();
if (process != null) {
process.destroy();
}
if (errorThread != null) {
try {
errorThread.halt();
@ -322,8 +325,6 @@ public void close() {
}
super.close();
if (process != null)
process.destroy();
}
}
@ -377,6 +378,9 @@ class SshPushConnection extends BasePackPushConnection {
public void close() {
endOut();
if (process != null) {
process.destroy();
}
if (errorThread != null) {
try {
errorThread.halt();
@ -388,8 +392,6 @@ public void close() {
}
super.close();
if (process != null)
process.destroy();
}
}
}