Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2005-05-16 13:17:48 +0000
committerMichael Valenta2005-05-16 13:17:48 +0000
commit522ede9db236a1e31bfa0a7ec259be3489b64d98 (patch)
tree9a69f1ca21ee0fb45693a66ad5734a58682ec856
parent5ef8dd39db2952f1c2add89b3418ee5ea0a3769a (diff)
downloadeclipse.platform.team-522ede9db236a1e31bfa0a7ec259be3489b64d98.tar.gz
eclipse.platform.team-522ede9db236a1e31bfa0a7ec259be3489b64d98.tar.xz
eclipse.platform.team-522ede9db236a1e31bfa0a7ec259be3489b64d98.zip
Bug 95044 NPE when requested for a password and try to cancel
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java2
1 files changed, 2 insertions, 0 deletions
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 5cd831007..5bb142808 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
@@ -308,6 +308,8 @@ class JSchSession {
instruction,
prompt,
echo);
+ if (result == null)
+ return null; // canceled
if (result.length == 1 && prompt.length == 1 && prompt[0].trim().equalsIgnoreCase("password:")) { //$NON-NLS-1$
password = result[0];
passwordChanged = true;

Back to the top