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/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java

diff --git a/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java b/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
index 3e2f42a..442aaef 100644
--- a/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
+++ b/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
@@ -129,13 +129,10 @@
     private NodeId localNodeId;
     private Timer requestRoleTimer;
 
-    //@Property(name = "useRegionForBalanceRoles", boolValue = DEFAULT_USE_REGION_FOR_BALANCE_ROLES,
-    //        label = "Use Regions for balancing roles")
+    /** Use Regions for balancing roles. */
     protected boolean useRegionForBalanceRoles = USE_REGION_FOR_BALANCE_ROLES_DEFAULT;
 
-    //@Property(name = "rebalanceRolesOnUpgrade",
-    //        boolValue = DEFAULT_REBALANCE_ROLES_ON_UPGRADE,
-    //        label = "Automatically rebalance roles following an upgrade")
+    /** Automatically rebalance roles following an upgrade. */
     protected boolean rebalanceRolesOnUpgrade = REBALANCE_ROLES_ON_UPGRADE_DEFAULT;
 
     @Activate
@@ -156,8 +153,10 @@
         Set<ConfigProperty> configProperties = cfgService.getProperties(getClass().getCanonicalName());
         if (configProperties != null) {
             for (ConfigProperty property : configProperties) {
-                if ("useRegionForBalanceRoles".equals(property.name())) {
+                if (USE_REGION_FOR_BALANCE_ROLES.equals(property.name())) {
                     useRegionForBalanceRoles = property.asBoolean();
+                } else if (REBALANCE_ROLES_ON_UPGRADE.equals(property.name())) {
+                    rebalanceRolesOnUpgrade = property.asBoolean();
                 }
             }
         }