commit f0e7ed3c66728768f595fcd915e4ce04778bef7b
author Shekhar Aryan <shekhar.aryan@infosys.com> Thu Jun 20 14:03:07 2019 +0000
committer Pier Luigi Ventre <pier@opennetworking.org> Mon Jul 08 14:56:17 2019 +0000
tree 63e7798a24163a84d0baddc3a64ea1ab4b37587d
parent 3c5fec1ddb9621c067cc6773d27a252da5aaf18f

SEBA 637 change in McastHandler.java
Cherry picked to branches 2.1, 1.13 and 1.15

Change-Id: I211b1509f105eff62616b1dd6aa56a18a6faf562
(cherry picked from commit c87503f511a74908b68f7b788426e2d14ab65cc6)

apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/mcast/McastHandler.java

diff --git a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/mcast/McastHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/mcast/McastHandler.java
index 3962053..f5247af 100644
--- a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/mcast/McastHandler.java
+++ b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/mcast/McastHandler.java
@@ -948,7 +948,7 @@
                                                       ConnectPoint source) {
         final Set<ConnectPoint> sinksToBeProcessed = Sets.newHashSet();
         prevsinks.forEach(((hostId, connectPoints) -> {
-            if (HostId.NONE.equals(hostId)) {
+            if (Objects.equal(HostId.NONE, hostId)) {
                 //in this case connect points are single homed sinks.
                 //just found the difference btw previous and new sinks for this source.
                 Set<ConnectPoint> difference = Sets.difference(connectPoints, newSinks.get(hostId));
@@ -1020,7 +1020,7 @@
         final Set<ConnectPoint> sinksToBeProcessed = Sets.newHashSet();
         sinks.forEach(((hostId, connectPoints) -> {
             //add all connect points that are not tied with any host
-            if (hostId.equals(HostId.NONE)) {
+            if (Objects.equal(HostId.NONE, hostId)) {
                 sinksToBeProcessed.addAll(connectPoints);
                 return;
             }