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/SinglePointToMultiPointIntent.java

diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/SinglePointToMultiPointIntent.java b/core/api/src/main/java/org/onlab/onos/net/intent/SinglePointToMultiPointIntent.java
index bb38846..efe96e2 100644
--- a/core/api/src/main/java/org/onlab/onos/net/intent/SinglePointToMultiPointIntent.java
+++ b/core/api/src/main/java/org/onlab/onos/net/intent/SinglePointToMultiPointIntent.java
@@ -56,8 +56,12 @@
         super(id(SinglePointToMultiPointIntent.class, selector, treatment,
                  ingressPoint, egressPoints), appId, null, selector, treatment);
         checkNotNull(egressPoints);
+        checkNotNull(ingressPoint);
         checkArgument(!egressPoints.isEmpty(), "Egress point set cannot be empty");
-        this.ingressPoint = checkNotNull(ingressPoint);
+        checkArgument(!egressPoints.contains(ingressPoint),
+                "Set of egresses should not contain ingress (ingress: %s)", ingressPoint);
+
+        this.ingressPoint = ingressPoint;
         this.egressPoints = Sets.newHashSet(egressPoints);
     }