mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
CLOUDSTACK-1934: NPE with listSupportedNetworkServices
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:
parent
4ae3e5de7f
commit
c0419791ed
@ -1013,7 +1013,10 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
|
||||
Set<Provider> supportedProviders = new HashSet<Provider>();
|
||||
|
||||
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 {
|
||||
for (List<Provider> pList : s_serviceToImplementedProvidersMap.values()) {
|
||||
supportedProviders.addAll(pList);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user