commit d4d88018ccf3454926fe2453defd2e28ffea7ead
author Daniel Park <dan.park@sk.com> Fri Aug 05 08:56:53 2016 +0900
committer Daniel Park <dan.park@sk.com> Fri Aug 05 09:00:15 2016 +0900
tree 1eec868544ea4db3f8411473c794ca7c3a6b2fd7
parent 38351dee68433d2cb9bf5d94335ec6c676799a18

[ONOS-4930] Fix NPE from ScalableGateway caused by the event triggered before map creation

Change-Id: I4b4890274bafbac8eae9059a9ceaf390ab290a9b

apps/scalablegateway/src/main/java/org/onosproject/scalablegateway/impl/ScalableGatewayManager.java

diff --git a/apps/scalablegateway/src/main/java/org/onosproject/scalablegateway/impl/ScalableGatewayManager.java b/apps/scalablegateway/src/main/java/org/onosproject/scalablegateway/impl/ScalableGatewayManager.java
index d7cfc06..80b4f45 100644
--- a/apps/scalablegateway/src/main/java/org/onosproject/scalablegateway/impl/ScalableGatewayManager.java
+++ b/apps/scalablegateway/src/main/java/org/onosproject/scalablegateway/impl/ScalableGatewayManager.java
@@ -122,11 +122,6 @@
     @Activate
     protected void activate() {
         appId = coreService.registerApplication(APP_ID);
-        configRegistry.registerConfigFactory(configFactory);
-        configService.addListener(configListener);
-        deviceService.addListener(internalDeviceListener);
-
-        selectGroupHandler = new SelectGroupHandler(groupService, deviceService, driverService, appId);
 
         gatewayNodeMap = storageService.<DeviceId, GatewayNode>consistentMapBuilder()
                 .withSerializer(Serializer.using(GATEWAYNODE_SERIALIZER.build()))
@@ -134,6 +129,12 @@
                 .withApplicationId(appId)
                 .build();
 
+        configRegistry.registerConfigFactory(configFactory);
+        configService.addListener(configListener);
+        deviceService.addListener(internalDeviceListener);
+
+        selectGroupHandler = new SelectGroupHandler(groupService, deviceService, driverService, appId);
+
         log.info("started");
     }