commit 4563aa2f9eccaea6c02907390af29c7b2e2fcb2a
author Jian Li <pyguni@gmail.com> Mon Apr 04 14:57:38 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Apr 05 04:39:43 2016 +0000
tree fa4dadd343ce9a3b97b13eeab7eeb5b45605fe95
parent 3780d4b02144038ee6f05000fe81ac5ee03a512f

Fix NPE, CNF exceptions in REST API

Change-Id: Id24d48d54d3aba72baf59437e39edd24cf390eb4

apps/cpman/app/src/main/java/org/onosproject/cpman/impl/ControlPlaneMonitor.java

diff --git a/apps/cpman/app/src/main/java/org/onosproject/cpman/impl/ControlPlaneMonitor.java b/apps/cpman/app/src/main/java/org/onosproject/cpman/impl/ControlPlaneMonitor.java
index 9b276c3..3452255 100644
--- a/apps/cpman/app/src/main/java/org/onosproject/cpman/impl/ControlPlaneMonitor.java
+++ b/apps/cpman/app/src/main/java/org/onosproject/cpman/impl/ControlPlaneMonitor.java
@@ -297,10 +297,11 @@
                 return availableDeviceIdSet.stream().map(id ->
                         id.toString()).collect(Collectors.toSet());
             } else {
-                return availableResourceMap.get(resourceType);
+                Set<String> res = availableResourceMap.get(resourceType);
+                return res == null ? ImmutableSet.of() : res;
             }
         }
-        return null;
+        return ImmutableSet.of();
     }
 
     private MetricsDatabase genMDbBuilder(Type resourceType,