Committed by
Gerrit Code Review
Fix NPE, CNF exceptions in REST API
Change-Id: Id24d48d54d3aba72baf59437e39edd24cf390eb4
Showing
1 changed file
with
3 additions
and
2 deletions
... | @@ -297,10 +297,11 @@ public class ControlPlaneMonitor implements ControlPlaneMonitorService { | ... | @@ -297,10 +297,11 @@ public class ControlPlaneMonitor implements ControlPlaneMonitorService { |
297 | return availableDeviceIdSet.stream().map(id -> | 297 | return availableDeviceIdSet.stream().map(id -> |
298 | id.toString()).collect(Collectors.toSet()); | 298 | id.toString()).collect(Collectors.toSet()); |
299 | } else { | 299 | } else { |
300 | - return availableResourceMap.get(resourceType); | 300 | + Set<String> res = availableResourceMap.get(resourceType); |
301 | + return res == null ? ImmutableSet.of() : res; | ||
301 | } | 302 | } |
302 | } | 303 | } |
303 | - return null; | 304 | + return ImmutableSet.of(); |
304 | } | 305 | } |
305 | 306 | ||
306 | private MetricsDatabase genMDbBuilder(Type resourceType, | 307 | private MetricsDatabase genMDbBuilder(Type resourceType, | ... | ... |
-
Please register or login to post a comment