commit 1487decc73031e5994c28141161e00e7c9113ce0
author Andrea Campanella <andrea@opennetworking.org> Thu May 10 19:18:48 2018 +0200
committer Ray Milkey <ray@opennetworking.org> Thu May 10 17:43:06 2018 +0000
tree 7b132659de9c5469183f37e729e8a60c4970dc83
parent b955fec073cd90b3b1ac4cbab51e82d110ca43d1

Fixing NPE for absent blackhole config

Change-Id: I9e558a3182d82d49746f4202468fdb6edab012ff

apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/AppConfigHandler.java

diff --git a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/AppConfigHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/AppConfigHandler.java
index 034ddfe..38d8aac 100644
--- a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/AppConfigHandler.java
+++ b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/AppConfigHandler.java
@@ -128,9 +128,11 @@
         SegmentRoutingAppConfig config =
                 srManager.cfgService.getConfig(srManager.appId, SegmentRoutingAppConfig.class);
         populateVRouter(deviceId, getMacAddresses(config));
-        config.blackholeIPs().forEach(ipPrefix -> {
-            srManager.routingRulePopulator.populateDefaultRouteBlackhole(deviceId, ipPrefix);
-        });
+        if (config != null) {
+            config.blackholeIPs().forEach(ipPrefix -> {
+                srManager.routingRulePopulator.populateDefaultRouteBlackhole(deviceId, ipPrefix);
+            });
+        }
     }
 
     private void populateVRouter(DeviceId deviceId, Set<MacAddress> pendingAdd) {