commit c637188a34b9f11e753ddd2f3164ba94981da9d4
author Madan Jampani <madan@onlab.us> Fri Jun 03 21:30:17 2016 -0700
committer Madan Jampani <madan@onlab.us> Sat Jun 04 14:18:01 2016 -0700
tree d6f474aab91da31af5636e492ed8591ee15636ab
parent 78be249d5219805d488095ef62603d040394dd99

Removed operation retry wrappers around various consistent map/atomic counter operations

Change-Id: Ie6c22a983a01bf3488eff51a493554319c5d15f8

providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java

diff --git a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java
index cd7e2d2..7459ce2 100644
--- a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java
+++ b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java
@@ -27,7 +27,6 @@
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.onlab.packet.Ethernet;
 import org.onlab.util.SharedExecutors;
-import org.onlab.util.Tools;
 import org.onosproject.cfg.ComponentConfigService;
 import org.onosproject.cluster.ClusterMetadataService;
 import org.onosproject.cluster.ClusterService;
@@ -64,7 +63,6 @@
 import org.onosproject.net.provider.ProviderId;
 import org.onosproject.provider.lldpcommon.LinkDiscoveryContext;
 import org.onosproject.provider.lldpcommon.LinkDiscovery;
-import org.onosproject.store.service.ConsistentMapException;
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;
 
@@ -246,14 +244,10 @@
         cfgRegistry.addListener(cfgListener);
         factories.forEach(cfgRegistry::registerConfigFactory);
 
-        SuppressionConfig cfg =
-                Tools.retryable(() -> cfgRegistry.getConfig(appId, SuppressionConfig.class),
-                                ConsistentMapException.class, MAX_RETRIES, RETRY_DELAY).get();
+        SuppressionConfig cfg = cfgRegistry.getConfig(appId, SuppressionConfig.class);
         if (cfg == null) {
             // If no configuration is found, register default.
-            cfg = Tools.retryable(this::setDefaultSuppressionConfig,
-                                  ConsistentMapException.class,
-                                  MAX_RETRIES, RETRY_DELAY).get();
+            cfg = this.setDefaultSuppressionConfig();
         }
         cfgListener.reconfigureSuppressionRules(cfg);