commit 4f3193a0fd3f1d40db404efe9787a2d7cbceb35a
author Jordan Halterman <jordan@onlab.us> Tue Jul 11 20:32:49 2017 -0700
committer Jordan Halterman <jordan@onlab.us> Wed Jul 12 18:54:25 2017 +0000
tree 875ed99c9191ed20aa363b8e5440950d2cd90b87
parent f7aa3f947f536bb1a695918b7115d7e75257ee96

[ONOS-6721] Add dependency of FlowRuleManager on DriverService to ensure driver service is bound prior to usage.

Change-Id: I1f0b60e8fdbcb1d6fcf7bbd4028478140e12669d

core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
index 6c47560..81cf1c8 100644
--- a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
+++ b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
@@ -40,6 +40,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.flow.CompletedBatchOperation;
 import org.onosproject.net.flow.DefaultFlowEntry;
 import org.onosproject.net.flow.FlowEntry;
@@ -148,6 +149,9 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected ComponentConfigService cfgService;
 
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected DriverService driverService;
+
     @Activate
     public void activate(ComponentContext context) {
         modified(context);