Close copy threads in case of errors
Bug: 484775 Change-Id: I3c7105188e615b6b994261f4ece0c8abc98eb444 Signed-off-by: Dmitry Neverov <dmitry.neverov@gmail.com>
This commit is contained in:
parent
d88695e412
commit
9c71bf14b7
|
@ -149,14 +149,27 @@ private class JschProcess extends Process {
|
|||
channel.setCommand(commandName);
|
||||
setupStreams();
|
||||
channel.connect(timeout > 0 ? timeout * 1000 : 0);
|
||||
if (!channel.isConnected())
|
||||
if (!channel.isConnected()) {
|
||||
closeOutputStream();
|
||||
throw new TransportException(uri,
|
||||
JGitText.get().connectionFailed);
|
||||
}
|
||||
} catch (JSchException e) {
|
||||
closeOutputStream();
|
||||
throw new TransportException(uri, e.getMessage(), e);
|
||||
}
|
||||
}
|
||||
|
||||
private void closeOutputStream() {
|
||||
if (outputStream != null) {
|
||||
try {
|
||||
outputStream.close();
|
||||
} catch (IOException ioe) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void setupStreams() throws IOException {
|
||||
inputStream = channel.getInputStream();
|
||||
|
||||
|
|
Loading…
Reference in New Issue