aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-04-03 06:49:56 +0200
committerKenny Root <kenny@the-b.org>2015-04-03 06:50:30 +0200
commitec8fe076919db2990888a4fdd3226abfc280407d (patch)
treead8726f834774927f81b742d0c9cc8a1e4215785
parent0d68f43b144e25f07ac1f894b3c457a6945e8ec0 (diff)
downloadconnectbot-ec8fe076919db2990888a4fdd3226abfc280407d.tar.gz
connectbot-ec8fe076919db2990888a4fdd3226abfc280407d.tar.bz2
connectbot-ec8fe076919db2990888a4fdd3226abfc280407d.zip
Break circle since connectionLost should not call close
-rw-r--r--src/org/connectbot/transport/SSH.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/connectbot/transport/SSH.java b/src/org/connectbot/transport/SSH.java
index 494c783..c5103f5 100644
--- a/src/org/connectbot/transport/SSH.java
+++ b/src/org/connectbot/transport/SSH.java
@@ -456,6 +456,7 @@ public class SSH extends AbsTransport implements ConnectionMonitor, InteractiveC
// Display the reason in the text.
bridge.outputLine(e.getCause().getMessage());
+ close();
onDisconnect();
return;
}
@@ -490,8 +491,6 @@ public class SSH extends AbsTransport implements ConnectionMonitor, InteractiveC
}
private void onDisconnect() {
- close();
-
bridge.dispatchDisconnect(false);
}
@@ -522,6 +521,7 @@ public class SSH extends AbsTransport implements ConnectionMonitor, InteractiveC
}
if ((newConditions & ChannelCondition.EOF) != 0) {
+ close();
onDisconnect();
throw new IOException("Remote end closed connection");
}