commit 361bc539ea32b618356ed4f27b1648a238479d6e
author Thomas Vachuska <tom@onlab.us> Mon Nov 10 20:03:27 2014 -0800
committer Gerrit Code Review <gerrit@onlab.us> Mon Nov 10 20:03:27 2014 -0800
tree 2fd9a4131dbe8e8993f345c99a37f5168c8942ad
parent 92a18865bedff3c890a1f7b1841a269d3947be9d
parent c672d7d11f703d08f076febefdc00e98dbde37bd

Merge "Fix bug in validate() in BooleanConstraint"

core/api/src/main/java/org/onlab/onos/net/intent/constraint/BooleanConstraint.java

diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/BooleanConstraint.java b/core/api/src/main/java/org/onlab/onos/net/intent/constraint/BooleanConstraint.java
index 97c5695..4e9fc9a 100644
--- a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/BooleanConstraint.java
+++ b/core/api/src/main/java/org/onlab/onos/net/intent/constraint/BooleanConstraint.java
@@ -52,7 +52,7 @@
     @Override
     public boolean validate(Path path, LinkResourceService resourceService) {
         for (Link link : path.links()) {
-            if (isValid(link, resourceService)) {
+            if (!isValid(link, resourceService)) {
                 return false;
             }
         }

core/api/src/main/java/org/onlab/onos/net/intent/constraint/ObstacleConstraint.java

diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/ObstacleConstraint.java b/core/api/src/main/java/org/onlab/onos/net/intent/constraint/ObstacleConstraint.java
index 3ed3fae..6d73fc2 100644
--- a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/ObstacleConstraint.java
+++ b/core/api/src/main/java/org/onlab/onos/net/intent/constraint/ObstacleConstraint.java
@@ -19,7 +19,6 @@
 import com.google.common.collect.ImmutableSet;
 import org.onlab.onos.net.DeviceId;
 import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
 import org.onlab.onos.net.resource.LinkResourceService;
 
 import java.util.Objects;
@@ -49,17 +48,6 @@
     }
 
     @Override
-    public boolean validate(Path path, LinkResourceService resourceService) {
-        for (Link link : path.links()) {
-            if (!isValid(link, resourceService)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    @Override
     public int hashCode() {
         return Objects.hash(obstacles);
     }