From a5b5b9cfdf633d642615ae12c2b4767dfeb5bb26 Mon Sep 17 00:00:00 2001
From: Charles Chan <rascov@gmail.com>
Date: Wed, 13 Sep 2017 20:00:05 -0700
Subject: [PATCH] Fix NPE in DhcpRelayManager

Change-Id: Iad6d266e314ad4d03a5e78d8d7b9780f0e904f70
---
 .../java/org/onosproject/dhcprelay/DhcpRelayManager.java     | 5 +++++
 1 file changed, 5 insertions(+)

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 6eca1e860d..30c9c16950 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 @@ public class DhcpRelayManager implements DhcpRelayService {
 
         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);