commit 3cc2330018584191153d1998f57404b69b27689d
author Jonathan Hart <jono@onlab.us> Thu May 14 09:21:16 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu May 14 23:24:32 2015 +0000
tree 8a336a0cd89dd6f2adc568b3efbcf74940cf41a1
parent 0b9899830e0a2cd0b6b9ad7ed7ac16cb05004138

Fix for NPE in SDNIP

Change-Id: I368db30e40b2081e92901e413f8c87e9db98e086

apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java

diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java
index e80dd3d..ff99708 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java
+++ b/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java
@@ -35,6 +35,8 @@
 import org.onosproject.routing.config.RoutingConfigurationService;
 import org.slf4j.Logger;
 
+import java.util.Objects;
+
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
@@ -152,8 +154,7 @@
             if (!event.subject().topic().equals(appId.name())) {
                 return;         // Not our topic: ignore
             }
-            if (!event.subject().leader().equals(
-                        localControllerNode.id())) {
+            if (Objects.equals(event.subject().leader(), localControllerNode.id())) {
                 return;         // The event is not about this instance: ignore
             }