From aaf3b99228100575c125b2dcb4ed082adbe8b4b2 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Wed, 9 Nov 2011 11:48:06 -0800 Subject: [PATCH] NAAS: fixing NPE in createnetworkoffering with out service capabilities specified --- .../configuration/ConfigurationManagerImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index a274e684e74..8b147fcbd86 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -2988,9 +2988,10 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura } void validateLoadBalancerServiceCapabilities(Map lbServiceCapabilityMap) { - if ((lbServiceCapabilityMap != null) && (lbServiceCapabilityMap.keySet().size() > 1 || !lbServiceCapabilityMap.containsKey(Capability.SupportedLBIsolation.getName()))) { - throw new InvalidParameterValueException("Only Load balancer isolation capability can be sepcified for LB service"); - } else { + if (lbServiceCapabilityMap != null) { + if (lbServiceCapabilityMap.keySet().size() > 1 || !lbServiceCapabilityMap.containsKey(Capability.SupportedLBIsolation.getName())) { + throw new InvalidParameterValueException("Only Load balancer isolation capability can be sepcified for LB service"); + } String isolationCapability = lbServiceCapabilityMap.get(Capability.SupportedLBIsolation.getName()); boolean dedicatedLb = isolationCapability.contains("dedicated"); boolean sharedLB = isolationCapability.contains("shared"); @@ -3001,9 +3002,10 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura } void validateFirewallServiceCapablities(Map fwServiceCapabilityMap) { - if ((fwServiceCapabilityMap != null) && (fwServiceCapabilityMap.keySet().size() > 1) || !fwServiceCapabilityMap.containsKey(Capability.SupportedSourceNatTypes.getName())) { - throw new InvalidParameterValueException("Only Supported Source NAT type capability can be sepcified for firewall service"); - } else { + if (fwServiceCapabilityMap != null) { + if (fwServiceCapabilityMap.keySet().size() > 1 || !fwServiceCapabilityMap.containsKey(Capability.SupportedSourceNatTypes.getName())) { + throw new InvalidParameterValueException("Only Supported Source NAT type capability can be sepcified for firewall service"); + } String sourceNatType = fwServiceCapabilityMap.get(Capability.SupportedSourceNatTypes.getName()); boolean perAccount = sourceNatType.contains("peraccount"); boolean perZone = sourceNatType.contains("perzone"); @@ -3012,7 +3014,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura } } } - + @Override @DB public NetworkOfferingVO createNetworkOffering(long userId, String name, String displayText, TrafficType trafficType, String tags, Integer maxConnections, boolean specifyVlan,