diff options
-rw-r--r-- | bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.15.jar | bin | 100755 -> 0 bytes | |||
-rw-r--r-- | bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.16.jar | bin | 99777 -> 101612 bytes | |||
-rw-r--r-- | bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java | 14 |
3 files changed, 13 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.15.jar b/bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.15.jar Binary files differdeleted file mode 100644 index fc568041f..000000000 --- a/bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.15.jar +++ /dev/null diff --git a/bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.16.jar b/bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.16.jar Binary files differindex 4b1441a7d..3f77d8988 100644 --- a/bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.16.jar +++ b/bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.16.jar diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java index 54bf41fa4..7d232da72 100644 --- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java +++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java @@ -19,6 +19,7 @@ import java.util.Enumeration; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.team.internal.ccvs.core.CVSException; @@ -157,7 +158,12 @@ class JSchSession { public void setUsername(String username) { } }; - authenticator.promptForUserInfo(includeLocation ? location : null, info, message); + try{ + authenticator.promptForUserInfo(includeLocation ? location : null, info, message); + } + catch(OperationCanceledException e){ + _password[0]=null; + } return _password[0]; } public boolean promptPassphrase(String message) { @@ -212,6 +218,9 @@ class JSchSession { echo); return result; } + catch(OperationCanceledException e){ + return null; + } catch(CVSException e){ return null; } @@ -300,6 +309,9 @@ class JSchSession { return session; } catch (JSchException e) { pool.remove(key); + if(e.toString().indexOf("Auth cancel")!=-1){ //$NON-NLS-1$ + throw new OperationCanceledException(""); //$NON-NLS-1$ + } throw e; } } |