commit 85c2926df210c0ba2d6fc0ec76167aab2110ecdc
author Brian O'Connor <bocon@onlab.us> Tue Mar 10 20:53:43 2015 -0700
committer Brian O'Connor <bocon@onlab.us> Tue Mar 10 20:59:52 2015 -0700
tree b79bde252ddbc2dffe0ebfbe32603dfcf322ac79
parent c4f351d4060b6b9aa5615d168d2c39072fd13792

Protecting against NPE in ComponentConfigManager

Change-Id: Ia0ffe918dad12fef0823fd09e566f0d706a7da8c

core/net/src/main/java/org/onosproject/cfg/impl/ComponentConfigManager.java

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 bab7ac1..25af7ff 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
@@ -130,7 +130,8 @@
 
     @Override
     public Set<ConfigProperty> getProperties(String componentName) {
-        return ImmutableSet.copyOf(properties.get(componentName).values());
+        Map<String, ConfigProperty> map = properties.get(componentName);
+        return map != null ? ImmutableSet.copyOf(map.values()) : null;
     }
 
     @Override