commit 1cf1fa4c6911c26005259f54bb9d5bca09b0caa2
author Thomas Vachuska <tom@onlab.us> Thu Jan 19 13:56:19 2017 -0800
committer Ray Milkey <ray@onlab.us> Fri Jan 20 00:26:20 2017 +0000
tree fdfb99b5100724c46020f8f12b64d312b04c2c58
parent d22c991c6a7a8126d567d5c4a29cdf55251f6dcc

Fix for ONOS-4618.

Change-Id: If36e50d64a53e8c49aaafabe195bc057e7e17b74

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

diff --git a/core/store/dist/src/main/java/org/onosproject/store/link/impl/ECLinkStore.java b/core/store/dist/src/main/java/org/onosproject/store/link/impl/ECLinkStore.java
index fbaabd6..d93672e 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/link/impl/ECLinkStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/link/impl/ECLinkStore.java
@@ -261,9 +261,9 @@
             linkDescriptions.compute(internalLinkKey, (k, v) -> createOrUpdateLinkInternal(v, linkDescription));
             return refreshLinkCache(linkKey);
         } else {
-            // Only forward for ConfigProvider
+            // Only forward for ConfigProvider or NullProvider
             // Forwarding was added as a workaround for ONOS-490
-            if (!providerId.scheme().equals("cfg")) {
+            if (!providerId.scheme().equals("cfg") && !providerId.scheme().equals("null")) {
                 return null;
             }
             // Temporary hack for NPE (ONOS-1171).