commit 8e8e72c70d9ed69dec597e959f7ee9747145e59b
author Charles Chan <rascov@gmail.com> Wed Sep 13 20:00:05 2017 -0700
committer Charles Chan <rascov@gmail.com> Wed Sep 13 20:00:05 2017 -0700
tree a0d7e3b2112832858631e68075197d653b34bd21
parent 17a200e0c12fefe03978c2a595905a7e3bf87171

Fix NPE in DhcpRelayManager

Change-Id: Iad6d266e314ad4d03a5e78d8d7b9780f0e904f70

apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java

diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java
index 1fd3e64..70901af 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java
@@ -669,6 +669,11 @@
 
         private void deviceAdd(DeviceId deviceId) {
             IgnoreDhcpConfig config = cfgService.getConfig(appId, IgnoreDhcpConfig.class);
+            if (config == null) {
+                log.debug("No ignoreVlan config found for {}. Do nothing.", deviceId);
+                return;
+            }
+
             Collection<VlanId> vlanIds = config.ignoredVlans().get(deviceId);
             vlanIds.forEach(vlanId -> {
                 processIgnoreVlanRule(deviceId, vlanId, ADD);