Do not guard registration with retries

[openflowplugin.git] / applications / forwardingrules-manager / src / main / java / org / opendaylight / openflowplugin / applications / frm / impl / ForwardingRulesManagerImpl.java

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ForwardingRulesManagerImpl.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ForwardingRulesManagerImpl.java
index 7b62d7025051613953224c27a6e6c65c769f7670..cd0f6722063f99b76cc929315979d3b84da46cfa 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ForwardingRulesManagerImpl.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ForwardingRulesManagerImpl.java
@@ -71,8 +71,6 @@ import org.slf4j.LoggerFactory;
 public final class ForwardingRulesManagerImpl implements ForwardingRulesManager {
     private static final Logger LOG = LoggerFactory.getLogger(ForwardingRulesManagerImpl.class);
 
-    static final int STARTUP_LOOP_TICK = 1000;
-    static final int STARTUP_LOOP_MAX_RETRIES = 240;
     private static final int FRM_RECONCILIATION_PRIORITY = Integer.getInteger("frm.reconciliation.priority", 1);
     private static final String SERVICE_NAME = "FRM";
 
@@ -165,7 +163,7 @@ public final class ForwardingRulesManagerImpl implements ForwardingRulesManager
         devicesGroupRegistry = new DevicesGroupRegistry();
         nodeListener = new FlowNodeReconciliationImpl(this, dataService, SERVICE_NAME, FRM_RECONCILIATION_PRIORITY,
                 ResultState.DONOTHING, flowGroupCacheManager);
-        if (this.isReconciliationDisabled()) {
+        if (isReconciliationDisabled()) {
             LOG.debug("Reconciliation is disabled by user");
         } else {
             reconciliationNotificationRegistration = reconciliationManager.registerService(nodeListener);