From f5a5863252db9f0e918197ca2c8d829c05687e7b Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Tue, 8 Jul 2008 17:31:41 +0000 Subject: [PATCH] [205674][ssh] Terminal remains "connecting" when authentication is cancelled --- .../eclipse/tm/internal/terminal/ssh/SshConnection.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java index 0fd464c66e4..0d156afbe08 100644 --- a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java +++ b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java @@ -16,6 +16,7 @@ * Johnson Ma (Wind River) - [218880] Add UI setting for ssh keepalives * Martin Oberhuber (Wind River) - [225792] Rename SshConnector.getTelnetSettings() to getSshSettings() * Martin Oberhuber (Wind River) - [168197] Replace JFace MessagDialog by SWT MessageBox + * Martin Oberhuber (Wind River) - [205674][ssh] Terminal remains "connecting" when authentication is cancelled *******************************************************************************/ package org.eclipse.tm.internal.terminal.ssh; @@ -132,12 +133,7 @@ class SshConnection extends Thread { } // when reading is done, we set the state to closed fControl.setState(TerminalState.CLOSED); - } catch (JSchException e) { - if(e.toString().indexOf("Auth cancel")<0) { //$NON-NLS-1$ - //no error if user pressed cancel - connectFailed(e.getMessage(),e.getMessage()); - } - } catch (IOException e) { + } catch (Exception e) { connectFailed(e.getMessage(),e.getMessage()); } finally {