From a2025dc40e22616ba4f572caeb7359759981f84b Mon Sep 17 00:00:00 2001 From: Tomas Cechvala Date: Tue, 14 Apr 2015 16:39:59 -0700 Subject: [PATCH] Empty string checking for subnet name Empty string is not valid value for subnet name. Signed-off-by: Tomas Cechvala --- .../neutron/mapper/mapping/NeutronSubnetAware.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronSubnetAware.java b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronSubnetAware.java index f1df5d1ad..208f0a2f6 100644 --- a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronSubnetAware.java +++ b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronSubnetAware.java @@ -27,6 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Optional; +import com.google.common.base.Strings; public class NeutronSubnetAware implements INeutronSubnetAware { @@ -66,7 +67,7 @@ public class NeutronSubnetAware implements INeutronSubnetAware { SubnetBuilder subnetBuilder = new SubnetBuilder(); subnetBuilder.setId(new SubnetId(neutronSubnet.getID())); subnetBuilder.setParent(new ContextId(neutronSubnet.getNetworkUUID())); - if (neutronSubnet.getName() != null) { + if (!Strings.isNullOrEmpty(neutronSubnet.getName())) { subnetBuilder.setName(new Name(neutronSubnet.getName())); } subnetBuilder.setIpPrefix(Utils.createIpPrefix(neutronSubnet.getCidr())); -- 2.36.6