commit dc2e7c26f904b915f5d69bff889536a442a8bc27
author HIGUCHI Yuta <y-higuchi@ak.jp.nec.com> Tue Feb 24 12:19:47 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Feb 24 23:44:40 2015 +0000
tree a079badc9adcd2e740dceeffc48bec9abc93549b
parent 892509aa5fa6400c0e680c701ec69860e8605b0b

Fix for NPE

Fix for NPE reported by ONOS-1171

Change-Id: Iadb960eb2806e0d33da034f36ad2a0f9c8aa1be0

core/store/dist/src/main/java/org/onosproject/store/link/impl/GossipLinkStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/link/impl/GossipLinkStore.java b/core/store/dist/src/main/java/org/onosproject/store/link/impl/GossipLinkStore.java
index 013b20c..ada3b69 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/link/impl/GossipLinkStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/link/impl/GossipLinkStore.java
@@ -309,6 +309,14 @@
             }
 
         } else {
+            // FIXME Temporary hack for NPE (ONOS-1171).
+            // Proper fix is to implement forwarding to master on ConfigProvider
+            // redo ONOS-490
+            if (dstNode == null) {
+                // silently ignore
+                return null;
+            }
+
 
             LinkInjectedEvent linkInjectedEvent = new LinkInjectedEvent(providerId, linkDescription);
             ClusterMessage linkInjectedMessage = new ClusterMessage(localNode,