Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2010-12-15 09:47:01 -0500
committerTomasz Zarna2010-12-15 09:47:01 -0500
commit4a956cdb1518a217e823805468ae475732d67c5e (patch)
treef8c7678a64f6da8e3d40dbd92d4ae185697ac431
parent5653dbc6e52728838e8e6eb071ee41cf93ffe1af (diff)
downloadeclipse.platform.team-4a956cdb1518a217e823805468ae475732d67c5e.tar.gz
eclipse.platform.team-4a956cdb1518a217e823805468ae475732d67c5e.tar.xz
eclipse.platform.team-4a956cdb1518a217e823805468ae475732d67c5e.zip
bug 332612: Incorrect argument passed to isSupervised in ResourceVariantTreeSubscriber.members(IResource)
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java
index e4ab9d0fc..e64b9b2c3 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -101,7 +101,7 @@ public abstract class ResourceVariantTreeSubscriber extends Subscriber {
if(!member.exists() && !getRemoteTree().hasResourceVariant(member)) {
// Remove deletion conflicts
iterator.remove();
- } else if (!isSupervised(resource)) {
+ } else if (!isSupervised(member)) {
// Remove unsupervised resources
iterator.remove();
}

Back to the top