diff options
| author | Michael Valenta | 2002-02-07 17:03:26 +0000 |
|---|---|---|
| committer | Michael Valenta | 2002-02-07 17:03:26 +0000 |
| commit | f7e3c0932ce6fd15f6a7e10ff5329cd77f0dae90 (patch) | |
| tree | 0be2e4ee3340518b48ac1948342081f9c45144ae | |
| parent | b0b6d4644ea73498444377461d4f71361fe8f5e0 (diff) | |
| download | eclipse.platform.team-f7e3c0932ce6fd15f6a7e10ff5329cd77f0dae90.tar.gz eclipse.platform.team-f7e3c0932ce6fd15f6a7e10ff5329cd77f0dae90.tar.xz eclipse.platform.team-f7e3c0932ce6fd15f6a7e10ff5329cd77f0dae90.zip | |
9188:NPE attempting to commit changes
| -rw-r--r-- | bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java index be5311568..8cd3592a5 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java @@ -6,13 +6,14 @@ package org.eclipse.team.internal.ccvs.core.client; */ import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.team.ccvs.core.CVSStatus; import org.eclipse.team.internal.ccvs.core.CVSException; +import org.eclipse.team.internal.ccvs.core.Policy; import org.eclipse.team.internal.ccvs.core.client.Command.GlobalOption; import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; import org.eclipse.team.internal.ccvs.core.resources.ICVSFolder; import org.eclipse.team.internal.ccvs.core.resources.ICVSResource; import org.eclipse.team.internal.ccvs.core.resources.ICVSResourceVisitor; -import org.eclipse.team.internal.ccvs.core.syncinfo.*; import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; import org.eclipse.team.internal.ccvs.core.util.Assert; @@ -66,6 +67,8 @@ public class Add extends Command { if (resources[i].isFolder()) { mFolder = (ICVSFolder) resources[i]; FolderSyncInfo info = mFolder.getParent().getFolderSyncInfo(); + if (info == null) + throw new CVSException(new CVSStatus(CVSStatus.ERROR, Policy.bind("Add.invalidParent", mFolder.getRelativePath(session.getLocalRoot())))); //$NON-NLS-1$ String repository = info.getRepository() + "/" + mFolder.getName(); //$NON-NLS-1$ mFolder.setFolderSyncInfo(new FolderSyncInfo(repository, info.getRoot(), info.getTag(), info.getIsStatic())); } |