commit 19e79b905b9fe863af68f2cf53bd69497febec18
author Deepa Vaddireddy <dvaddire@partner.ciena.com> Thu Oct 26 06:23:26 2017 +0000
committer Charles Chan <charles@opennetworking.org> Wed Nov 01 00:01:16 2017 +0000
tree 3c3537f20f581254bd258ac7dfc166e77645948b
parent 7da339e58881000d98b6db69cc1085ba1f3d5ec8

ONOS-7146
InterfaceManager fails to load interfaces from storage after ONOS 
is restarted

Change-Id: If499fa14c16e4fa511cd823306aceb3e0b10e5f3
(cherry picked from commit 2740a1119b5649224bdd68d0f9740f391c7c920a)

core/net/src/main/java/org/onosproject/net/intf/impl/InterfaceManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/intf/impl/InterfaceManager.java b/core/net/src/main/java/org/onosproject/net/intf/impl/InterfaceManager.java
index 469af6a..7a28bc48 100644
--- a/core/net/src/main/java/org/onosproject/net/intf/impl/InterfaceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/intf/impl/InterfaceManager.java
@@ -16,6 +16,7 @@
 
 package org.onosproject.net.intf.impl;
 
+
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -36,6 +37,7 @@
 import org.onosproject.net.intf.InterfaceListener;
 import org.onosproject.net.intf.InterfaceService;
 import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.config.BasicNetworkConfigService;
 import org.onosproject.net.config.NetworkConfigEvent;
 import org.onosproject.net.config.NetworkConfigListener;
 import org.onosproject.net.config.NetworkConfigService;
@@ -68,6 +70,10 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected NetworkConfigService configService;
 
+    //Dependency to ensure subject factories are properly initialized
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected BasicNetworkConfigService basicNetworkConfigService;
+
     private final InternalConfigListener listener = new InternalConfigListener();
 
     private final Map<ConnectPoint, Set<Interface>> interfaces = Maps.newConcurrentMap();