Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2003-09-29 20:43:40 +0000
committerMichael Valenta2003-09-29 20:43:40 +0000
commitbb796295a6a718469fdf4b81ec0524f59fc366f4 (patch)
treebb1e5146a1acf875858cfe88a76e160074236c77
parentbad96a7d34f77a22f9a1e7a088696ea98efc0456 (diff)
downloadeclipse.platform.team-bb796295a6a718469fdf4b81ec0524f59fc366f4.tar.gz
eclipse.platform.team-bb796295a6a718469fdf4b81ec0524f59fc366f4.tar.xz
eclipse.platform.team-bb796295a6a718469fdf4b81ec0524f59fc366f4.zip
Fix bug in rule containment checkI20030930
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ReentrantLock.java4
1 files 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;

Back to the top