commit 59afc6ad14028b4597cf53d812ed846329931d8c
author Jordan Halterman <jordan@opennetworking.org> Mon Oct 30 16:12:42 2017 -0700
committer Thomas Vachuska <tom@opennetworking.org> Tue Oct 31 23:04:29 2017 +0000
tree f5e802519fbda121f8ac86d9a526c4058e79128f
parent 1dbcd71f395ef4e4ba1464c4d3d26215e1ca3f74

[ONOS-7176] Add DriverService dependency to GroupManager to ensure drivers are available when initial device events are received

Change-Id: Ibcc1c694ab95b68d607a76112f8f87d534e7f712

core/net/src/main/java/org/onosproject/net/group/impl/GroupManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/group/impl/GroupManager.java b/core/net/src/main/java/org/onosproject/net/group/impl/GroupManager.java
index bc3c64d..9b82f5f 100644
--- a/core/net/src/main/java/org/onosproject/net/group/impl/GroupManager.java
+++ b/core/net/src/main/java/org/onosproject/net/group/impl/GroupManager.java
@@ -31,6 +31,7 @@
 import org.onosproject.net.device.DeviceEvent;
 import org.onosproject.net.device.DeviceListener;
 import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.driver.DriverService;
 import org.onosproject.net.group.Group;
 import org.onosproject.net.group.GroupBuckets;
 import org.onosproject.net.group.GroupDescription;
@@ -87,6 +88,10 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected DeviceService deviceService;
 
+    // Reference the DriverService to ensure the service is bound prior to initialization of the GroupDriverProvider
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected DriverService driverService;
+
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected ComponentConfigService cfgService;