diff options
author | Michael Valenta | 2005-02-09 15:37:33 +0000 |
---|---|---|
committer | Michael Valenta | 2005-02-09 15:37:33 +0000 |
commit | 4a434cb36b8b3f53af165d7d83a8d775922e4b3e (patch) | |
tree | ff054e299333f3b6a55cdccb894aa7b0b438cf4a /bundles/org.eclipse.team.core | |
parent | 1d7b4d27e2a3b93e7ac5df43e9ca5cfce9ac195f (diff) | |
download | eclipse.platform.team-4a434cb36b8b3f53af165d7d83a8d775922e4b3e.tar.gz eclipse.platform.team-4a434cb36b8b3f53af165d7d83a8d775922e4b3e.tar.xz eclipse.platform.team-4a434cb36b8b3f53af165d7d83a8d775922e4b3e.zip |
Fixed bug which caused an NPE
Diffstat (limited to 'bundles/org.eclipse.team.core')
-rw-r--r-- | bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberResourceMappingContext.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberResourceMappingContext.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberResourceMappingContext.java index 045afbffa..ea8fac81f 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberResourceMappingContext.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberResourceMappingContext.java @@ -285,7 +285,7 @@ public class SubscriberResourceMappingContext extends ResourceMappingContext { private IResourceVariant validateRemote(IResource resource, SyncInfo syncInfo) throws CoreException { if (syncInfo == null) return null; IResourceVariant remote = syncInfo.getRemote(); - if (syncInfo == null) return null; + if (remote == null) return null; boolean containerExpected = resource.getType() != IResource.FILE; if (remote.isContainer() && !containerExpected) { throw new CoreException(new Status(IStatus.ERROR, TeamPlugin.ID, IResourceStatus.RESOURCE_WRONG_TYPE, "Remote conterpart of {0} is a container" + resource.getFullPath().toString(), null)); |