From 7981a32f37d64225a5b641725ba172cdc32e2f0d Mon Sep 17 00:00:00 2001
From: Ray Milkey <ray@opennetworking.org>
Date: Thu, 16 Aug 2018 14:55:46 -0700
Subject: [PATCH] Fix NPE when component can't be found

Change-Id: I803240cde2d2b2c5efeee03617d0e3a275a2f570
---
 .../org/onosproject/cfg/impl/ComponentConfigManager.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/net/src/main/java/org/onosproject/cfg/impl/ComponentConfigManager.java b/core/net/src/main/java/org/onosproject/cfg/impl/ComponentConfigManager.java
index 011733c185..21a54b39a9 100644
--- a/core/net/src/main/java/org/onosproject/cfg/impl/ComponentConfigManager.java
+++ b/core/net/src/main/java/org/onosproject/cfg/impl/ComponentConfigManager.java
@@ -379,6 +379,11 @@ public class ComponentConfigManager implements ComponentConfigService {
         try {
             Configuration cfg = cfgAdmin.getConfiguration(componentName, null);
             Map<String, ConfigProperty> map = properties.get(componentName);
+            if (map == null) {
+                //  Prevent NPE if the component isn't there
+                log.warn("Component not found for " + componentName);
+                return;
+            }
             Dictionary<String, Object> props = new Hashtable<>();
             map.values().stream().filter(p -> p.value() != null)
                     .forEach(p -> props.put(p.name(), p.value()));