Protecting against NPE in ComponentConfigManager

Change-Id: Ia0ffe918dad12fef0823fd09e566f0d706a7da8c

Protecting against NPE in ComponentConfigManager
Change-Id: Ia0ffe918dad12fef0823fd09e566f0d706a7da8c
Brian O'Connor
Commit 85c2926df210c0ba2d6fc0ec76167aab2110ecdc 85c2926d 1 parent c4f351d4
Showing 1 changed file with 2 additions and 1 deletions
core/net/src/main/java/org/onosproject/cfg/impl/ComponentConfigManager.java
--- a/core/net/src/main/java/org/onosproject/cfg/impl/ComponentConfigManager.java
View file @85c2926
+++ b/core/net/src/main/java/org/onosproject/cfg/impl/ComponentConfigManager.java
View file @85c2926
@@ -130,7 +130,8 @@ public class ComponentConfigManager implements ComponentConfigService {
     @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