Empty string checking for subnet name 99/18299/1
authorTomas Cechvala <tcechval@cisco.com>
Tue, 14 Apr 2015 23:39:59 +0000 (16:39 -0700)
committerTomas Cechvala <tcechval@cisco.com>
Tue, 14 Apr 2015 23:39:59 +0000 (16:39 -0700)
Empty string is not valid value for subnet name.

Signed-off-by: Tomas Cechvala <tcechval@cisco.com>
neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronSubnetAware.java

index f1df5d1adb26c79eb2ba9f9211d7ca757c49326c..208f0a2f69b7ab97d7b7fc90cefa4a3dc3d9d73c 100644 (file)
@@ -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()));