commit 2e660807a213b0e40c1fb78e586c973121568636
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Fri Nov 21 14:55:32 2014 -0800
committer Jonathan Hart <jono@onlab.us> Fri Nov 21 15:22:06 2014 -0800
tree ba8d1c842e48806d301ff14e4bfb6aa1c22b2489
parent f19b7156245285de504b00e29355e7008621e4fd

Guard malformed intent by pre-condition check on instantiation

Change-Id: I90ca0fac2e3b68c4ca5b464777b0cdaa2227c2e5

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

diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/MultiPointToSinglePointIntent.java b/core/api/src/main/java/org/onlab/onos/net/intent/MultiPointToSinglePointIntent.java
index 8c8cbb0..15afedd 100644
--- a/core/api/src/main/java/org/onlab/onos/net/intent/MultiPointToSinglePointIntent.java
+++ b/core/api/src/main/java/org/onlab/onos/net/intent/MultiPointToSinglePointIntent.java
@@ -86,9 +86,12 @@
 
         checkNotNull(ingressPoints);
         checkArgument(!ingressPoints.isEmpty(), "Ingress point set cannot be empty");
+        checkNotNull(egressPoint);
+        checkArgument(!ingressPoints.contains(egressPoint),
+                "Set of ingresses should not contain egress (egress: %s)", egressPoint);
 
         this.ingressPoints = Sets.newHashSet(ingressPoints);
-        this.egressPoint = checkNotNull(egressPoint);
+        this.egressPoint = egressPoint;
     }
 
     /**