commit f566fa25034690f76477102c09822bff43c9f3f2
author Thomas Vachuska <tom@opennetworking.org> Tue Oct 30 14:03:36 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Tue Oct 30 23:43:48 2018 +0000
tree 8ec0babce611656d8f1cb5c4b4f0399cbe3895b1
parent 2110e4cb4ab202df42a4570df262220a3bd39aec

Removing commented out @Property annotations from the core.

Change-Id: I336f6a21db531187b8e2fcfb51e7da315c615771

core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedLeadershipStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedLeadershipStore.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedLeadershipStore.java
index 171e146..43959de 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedLeadershipStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedLeadershipStore.java
@@ -90,8 +90,7 @@
     @Reference(cardinality = MANDATORY)
     protected UpgradeService upgradeService;
 
-    //@Property(name = "electionTimeoutMillis", longValue = DEFAULT_ELECTION_TIMEOUT_MILLIS,
-    //        label = "the leader election timeout in milliseconds")
+    /** Leader election timeout in milliseconds. */
     private long electionTimeoutMillis = ELECTION_TIMEOUT_MILLIS_DEFAULT;
 
     private ExecutorService statusChangeHandler;
@@ -192,7 +191,7 @@
         Dictionary<?, ?> properties = context.getProperties();
         long newElectionTimeoutMillis;
         try {
-            String s = get(properties, "electionTimeoutMillis");
+            String s = get(properties, ELECTION_TIMEOUT_MILLIS);
             newElectionTimeoutMillis = isNullOrEmpty(s) ? electionTimeoutMillis : Long.parseLong(s.trim());
         } catch (NumberFormatException | ClassCastException e) {
             log.warn("Malformed configuration detected; using defaults", e);