commit 488a94c31e581329b0efb570161796ee0a07a57a
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Fri Jan 26 17:24:09 2018 -0800
committer Ray Milkey <ray@opennetworking.org> Mon Jan 29 21:12:15 2018 +0000
tree 944b6f2dcf506324e2a2925ef3fa856c7d6b9c69
parent 96b896d04336010065b2d740bba8bd6a0187dbd2

more error-prone issue fix

Change-Id: I49f2cc0459cfddddc6a99e2ebb8ad52d547e2909

apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRoute.java

diff --git a/apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRoute.java b/apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRoute.java
index 9449093..0f025d3 100644
--- a/apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRoute.java
+++ b/apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRoute.java
@@ -115,7 +115,6 @@
         checkNotNull(prefixMac);
         checkNotNull(prefix);
         //checkNotNull(nextHop); //next hop can be null in case of MP un reach.
-        checkNotNull(labelToInt);
         this.source = checkNotNull(source);
         this.prefix = prefix;
         this.prefixMac = prefixMac;
@@ -258,7 +257,7 @@
 
         EvpnRoute that = (EvpnRoute) other;
 
-        return Objects.equals(prefixMac, prefixMac)
+        return Objects.equals(prefixMac, that.prefixMac)
                 && Objects.equals(prefix, that.prefix)
                 && Objects.equals(nextHop, that.nextHop)
                 && Objects.equals(this.rd, that.rd)