commit 748507061689c90b5a666ed815ba2921a6333af4
author Jonathan Hart <jono@onlab.us> Thu May 04 13:01:24 2017 -0700
committer Ray Milkey <ray@onlab.us> Fri May 05 18:36:12 2017 +0000
tree e4cd077bbb087f739a75883eca65b407635baffe
parent f27a929fbb1d93b812c73db83c342f76a8d319e0

Initialize both route stores on activation.

This should prevent bugs due to the distributed store being initialized
at runtime.

Change-Id: I5dde57cc5d06c4b0d36b029f0e05933e7a80eee9

incubator/store/src/main/java/org/onosproject/incubator/store/routing/impl/RouteStoreImpl.java

diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/routing/impl/RouteStoreImpl.java b/incubator/store/src/main/java/org/onosproject/incubator/store/routing/impl/RouteStoreImpl.java
index f182489..c07f3a6 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/routing/impl/RouteStoreImpl.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/routing/impl/RouteStoreImpl.java
@@ -46,8 +46,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import static com.google.common.base.Preconditions.checkState;
-
 /**
  * An implementation of RouteStore that is backed by either LocalRouteStore or
  * DistributedRouteStore according to configuration.
@@ -70,19 +68,25 @@
     private final Logger log = LoggerFactory.getLogger(getClass());
     private RouteStore currentRouteStore;
 
+    private DistributedRouteStore distributedRouteStore;
+    private LocalRouteStore localRouteStore;
+
     @Activate
     public void activate(ComponentContext context) {
+        distributedRouteStore = new DistributedRouteStore(storageService);
+        distributedRouteStore.activate();
+        localRouteStore = new LocalRouteStore();
+        localRouteStore.activate();
+
         componentConfigService.registerProperties(getClass());
         modified(context);
     }
 
     @Deactivate
     public void deactivate() {
-        if (distributed) {
-            ((DistributedRouteStore) currentRouteStore).deactivate();
-        } else {
-            ((LocalRouteStore) currentRouteStore).deactivate();
-        }
+        localRouteStore.deactivate();
+        distributedRouteStore.deactivate();
+
         componentConfigService.unregisterProperties(getClass(), false);
     }
 
@@ -100,19 +104,9 @@
         // NOTE: new route store will be empty
         if (currentRouteStore == null || expectDistributed != distributed) {
             if (expectDistributed) {
-                if (currentRouteStore != null) {
-                    ((LocalRouteStore) currentRouteStore).deactivate();
-                }
-                currentRouteStore = new DistributedRouteStore(storageService);
-                ((DistributedRouteStore) currentRouteStore).activate();
-                ((DistributedRouteStore) currentRouteStore).setDelegate(delegate);
+                currentRouteStore = distributedRouteStore;
             } else {
-                if (currentRouteStore != null) {
-                    ((DistributedRouteStore) currentRouteStore).deactivate();
-                }
-                currentRouteStore = new LocalRouteStore();
-                ((LocalRouteStore) currentRouteStore).activate();
-                ((LocalRouteStore) currentRouteStore).setDelegate(delegate);
+                currentRouteStore = localRouteStore;
             }
 
             this.distributed = expectDistributed;
@@ -123,22 +117,20 @@
 
     @Override
     public void setDelegate(RouteStoreDelegate delegate) {
-        checkState(this.delegate == null || this.delegate == delegate,
-                "Store delegate already set");
-        this.delegate = delegate;
+        super.setDelegate(delegate);
 
-        // Set the delegate of underlying route store implementation
-        currentRouteStore.setDelegate(delegate);
+        // Set the delegate of underlying route store implementations
+        localRouteStore.setDelegate(delegate);
+        distributedRouteStore.setDelegate(delegate);
     }
 
     @Override
     public void unsetDelegate(RouteStoreDelegate delegate) {
-        if (this.delegate == delegate) {
-            this.delegate = null;
-        }
+        super.unsetDelegate(delegate);
 
-        // Unset the delegate of underlying route store implementation
-        currentRouteStore.unsetDelegate(delegate);
+        // Unset the delegate of underlying route store implementations
+        localRouteStore.unsetDelegate(delegate);
+        distributedRouteStore.unsetDelegate(delegate);
     }
 
     @Override