commit 8dc1a69a955e119500102f46bbb5329dcd7b849f
author Thomas Vachuska <tom@onlab.us> Tue Mar 31 01:01:37 2015 -0700
committer Ray Milkey <ray@onlab.us> Wed Apr 01 19:13:51 2015 +0000
tree ddc9bb220867daaa4439f83962ce796c0aade614
parent 20cfb8735a2279e4de439305abcff137a2d456c8

Added bootstrap code to auto-generate cluster.json, tablets.json and hazelcast.xml using local site address.

Change-Id: I3210aadc63403022b4aac3bc3591736801240b50

core/net/src/main/java/org/onosproject/app/impl/ApplicationManager.java

diff --git a/core/net/src/main/java/org/onosproject/app/impl/ApplicationManager.java b/core/net/src/main/java/org/onosproject/app/impl/ApplicationManager.java
index 5668578..6e3c3df 100644
--- a/core/net/src/main/java/org/onosproject/app/impl/ApplicationManager.java
+++ b/core/net/src/main/java/org/onosproject/app/impl/ApplicationManager.java
@@ -71,15 +71,15 @@
 
     @Activate
     public void activate() {
-        store.setDelegate(delegate);
         eventDispatcher.addSink(ApplicationEvent.class, listenerRegistry);
+        store.setDelegate(delegate);
         log.info("Started");
     }
 
     @Deactivate
     public void deactivate() {
-        store.unsetDelegate(delegate);
         eventDispatcher.removeSink(ApplicationEvent.class);
+        store.unsetDelegate(delegate);
         log.info("Stopped");
     }
 

core/net/src/main/java/org/onosproject/core/impl/CoreManager.java

diff --git a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
index 6484951..26d8528 100644
--- a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
+++ b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
@@ -27,6 +27,8 @@
 import org.onosproject.core.IdBlockStore;
 import org.onosproject.core.IdGenerator;
 import org.onosproject.core.Version;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.List;
@@ -41,6 +43,8 @@
 @Service
 public class CoreManager implements CoreService {
 
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
     private static final File VERSION_FILE = new File("../VERSION");
     private static Version version = Version.version("1.2.0-SNAPSHOT");