Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-05-01 02:36:51 +0000
committerMichael Valenta2004-05-01 02:36:51 +0000
commit832d2e2c8afa4f53ce85f655ce09ee223e606333 (patch)
tree25451a12196e7c84b816d758ecd4aea1ac682912
parent1b6335d4e5dfa9df57a829e44320646b58e92c80 (diff)
downloadeclipse.platform.team-832d2e2c8afa4f53ce85f655ce09ee223e606333.tar.gz
eclipse.platform.team-832d2e2c8afa4f53ce85f655ce09ee223e606333.tar.xz
eclipse.platform.team-832d2e2c8afa4f53ce85f655ce09ee223e606333.zip
51819: NPE during shutdown in DataArea.getStateLocation
-rw-r--r--bundles/org.eclipse.team.cvs.ssh/src/org/eclipse/team/internal/ccvs/ssh/Client.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.ssh/src/org/eclipse/team/internal/ccvs/ssh/Client.java b/bundles/org.eclipse.team.cvs.ssh/src/org/eclipse/team/internal/ccvs/ssh/Client.java
index cd2e60214..1073820d3 100644
--- a/bundles/org.eclipse.team.cvs.ssh/src/org/eclipse/team/internal/ccvs/ssh/Client.java
+++ b/bundles/org.eclipse.team.cvs.ssh/src/org/eclipse/team/internal/ccvs/ssh/Client.java
@@ -345,7 +345,7 @@ private void cleanup() throws IOException {
*/
public void connect(IProgressMonitor monitor) throws IOException, CVSAuthenticationException {
// If we're already connected, just ignore the invokation
- if (connected)
+ if (connected || monitor.isCanceled())
return;
// Otherwise, set up the connection
@@ -379,7 +379,7 @@ public void connect(IProgressMonitor monitor) throws IOException, CVSAuthenticat
// socket to be closed at this point.
// Don't allow cancellation during the initial handshake and login since this
// can potentially cause the SSH server to think that it is being hacked and
- // disable the account.
+ // disable the account.
socketOut.setIsCancellable(false /* don't allow cancellation */);
pollingInputStream.setIsCancellable(false);
StringBuffer buf = new StringBuffer();

Back to the top