commit a5b5b9cfdf633d642615ae12c2b4767dfeb5bb26
author Charles Chan <rascov@gmail.com> Wed Sep 13 20:00:05 2017 -0700
committer Charles Chan <rascov@gmail.com> Wed Sep 13 23:33:55 2017 -0700
tree fe9527b62fd4a239f18237bdbe19fd62e26bf369
parent bb86b78a348f7f7e01ff7aa6bd41041f1c926422

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 6eca1e8..30c9c16 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);