From bb796295a6a718469fdf4b81ec0524f59fc366f4 Mon Sep 17 00:00:00 2001 From: Michael Valenta Date: Mon, 29 Sep 2003 20:43:40 +0000 Subject: Fix bug in rule containment check --- .../org/eclipse/team/internal/ccvs/core/syncinfo/ReentrantLock.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ReentrantLock.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ReentrantLock.java index 938940fac..b21f21d21 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ReentrantLock.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ReentrantLock.java @@ -216,8 +216,8 @@ public class ReentrantLock { public boolean ruleContains(IResource resource) { for (Iterator iter = rules.iterator(); iter.hasNext();) { ISchedulingRule rule = (ISchedulingRule) iter.next(); - if (rule != NULL_SCHEDULING_RULE) { - return rule.contains(resource); + if (rule != NULL_SCHEDULING_RULE && rule.contains(resource)) { + return true; } } return false; -- cgit v1.2.3