diff options
| author | Tomasz Zarna | 2008-05-28 17:58:40 +0000 |
|---|---|---|
| committer | Tomasz Zarna | 2008-05-28 17:58:40 +0000 |
| commit | fae22903cdac0599ca296d8c0bcd44300330f870 (patch) | |
| tree | f1b3da6d78555f11fb2825d35b9485994826475b /bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs | |
| parent | 3148e707070176d660665b62a23176b09e15b173 (diff) | |
| download | eclipse.platform.team-fae22903cdac0599ca296d8c0bcd44300330f870.tar.gz eclipse.platform.team-fae22903cdac0599ca296d8c0bcd44300330f870.tar.xz eclipse.platform.team-fae22903cdac0599ca296d8c0bcd44300330f870.zip | |
bug 231190: NPE in CVSRepositoryLocation.fromString
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java index 333efca79..b05904858 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.team.internal.ccvs.core.connection; - import java.io.IOException; import java.util.*; @@ -349,7 +348,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit // Decrement the end since the slash is part of the path if (end != -1) end--; } - String host = (optionStart != -1) ? hmOptions.get("hostname").toString() : location.substring(start, hostEnd); //$NON-NLS-1$ + String host = (hmOptions.containsKey("hostname")) ? hmOptions.get("hostname").toString() : location.substring(start, hostEnd); //$NON-NLS-1$ //$NON-NLS-2$ int port = USE_DEFAULT_PORT; boolean havePort = false; if (hmOptions.containsKey("port")) { //$NON-NLS-1$ |