Mercurial > 510Connectbot

changeset 318:5351641c8a46 ganymed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add ecdsa key support everywhere
author Carl Byington <carl@five-ten-sg.com>
date Wed, 30 Jul 2014 17:46:06 -0700
parents cdb3c9215a9b
children 776a220dbcc6
files src/com/five_ten_sg/connectbot/transport/SSH.java
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/com/five_ten_sg/connectbot/transport/SSH.java	Wed Jul 30 17:01:21 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/transport/SSH.java	Wed Jul 30 17:46:06 2014 -0700
@@ -565,7 +565,9 @@
         catch (IOException e) {
             Log.e(TAG, "Problem in SSH connection thread during authentication", e);
             // Display the reason in the text.
-            bridge.outputLine(e.getCause().getMessage());
+            Throwable t = e.getCause();
+            String m = (t == null) ? e.getMessage() : t.getMessage();
+            bridge.outputLine(m);
             onDisconnect();
             return;
         }