Fix NPE in SegmentRoutingManager
NetworkConfigEventHandler must be initialized before adding NetworkConfigEventListener
Change-Id: I8eb40c8b7345b915e613a678df8e8c103980ee21
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
index ec2ea06..2cc5aae 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015-2016 Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -100,6 +100,8 @@
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
+import static com.google.common.base.Preconditions.checkState;
+
@Service
@Component(immediate = true)
/**
@@ -321,15 +323,14 @@
.withTimestampProvider((k, v) -> new WallClockTimestamp())
.build();
- cfgService.addListener(cfgListener);
- cfgService.registerConfigFactory(cfgDeviceFactory);
- cfgService.registerConfigFactory(cfgAppFactory);
-
processor = new InternalPacketProcessor();
linkListener = new InternalLinkListener();
deviceListener = new InternalDeviceListener();
netcfgHandler = new NetworkConfigEventHandler(this);
+ cfgService.addListener(cfgListener);
+ cfgService.registerConfigFactory(cfgDeviceFactory);
+ cfgService.registerConfigFactory(cfgAppFactory);
hostService.addListener(hostListener);
packetService.addProcessor(processor, PacketProcessor.director(2));
linkService.addListener(linkListener);
@@ -891,6 +892,7 @@
break;
}
} else if (event.configClass().equals(SegmentRoutingAppConfig.class)) {
+ checkState(netcfgHandler != null, "NetworkConfigEventHandler is not initialized");
switch (event.type()) {
case CONFIG_ADDED:
netcfgHandler.processVRouterConfigAdded(event);