Addressing gerrit 1182 Madhu's comment

- Making sure the executor service is available before the loadconfig
gets called, just in case of some race condition

Change-Id: Ib1d84c33536a68806d281d23855a6c0a5be2dd23
Signed-off-by: Giovanni Meo <gmeo@cisco.com>

diff --git a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java b/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java
index 0ac375668b9126caf7b2cfce26da5296706e4bb6..d08b24d0783f796f2bda87da71fa34833d37411f 100644 (file)
--- a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java
+++ b/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java
@@ -2517,6 +2517,9 @@ public class ForwardingRulesManager implements
         // Initialize graceful stop flag
         stopping = false;
 
+        // Allocate the executor service
+        this.executor = Executors.newSingleThreadExecutor();
+
         // Start event handler thread
         frmEventHandler.start();
 
@@ -2527,9 +2530,6 @@ public class ForwardingRulesManager implements
         if (staticFlows.isEmpty()) {
             loadFlowConfiguration();
         }
-
-        // Allocate the executor service
-        this.executor = Executors.newSingleThreadExecutor();
     }
 
     /**