apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-1934: NPE with listSupportedNetworkServices

Browse Source 
For 'connectivity' network service current set of providers (MidoNet,
NiciraNcp) not necessarily part of OSS builds. So handle the case where
there are no providers for a service
This commit is contained in:
Murali Reddy 2013-04-12 16:44:03 +05:30
parent 4ae3e5de7f
commit c0419791ed
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/com/cloud/network/NetworkModelImpl.java
View File

@ -1013,7 +1013,10 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
Set<Provider> supportedProviders = new HashSet<Provider>(); Set<Provider> supportedProviders = new HashSet<Provider>();
if (service != null) { if (service != null) {
supportedProviders.addAll(s_serviceToImplementedProvidersMap.get(service)); List<Provider> providers = s_serviceToImplementedProvidersMap.get(service);
if (providers != null && !providers.isEmpty()) {
supportedProviders.addAll(providers);
}
} else { } else {
for (List<Provider> pList : s_serviceToImplementedProvidersMap.values()) { for (List<Provider> pList : s_serviceToImplementedProvidersMap.values()) {
supportedProviders.addAll(pList); supportedProviders.addAll(pList);