From: Ed Warnicke <eaw@cisco.com>
Date: Fri, 1 Aug 2014 02:33:46 +0000 (+0000)
Subject: Merge "Fixed for bug : 1171 - issue while creating subnet"
X-Git-Tag: release/helium~382
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=c222e37f2a0f0f3f6266242fbea2d3b018f4e6e3;hp=c46e223995956f1f759c551163c212947c1e2fb7

Merge "Fixed for bug : 1171 - issue while creating subnet"
---

diff --git a/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java b/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java
index d032d2e8ac..1f10b39513 100644
--- a/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java
+++ b/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java
@@ -299,7 +299,7 @@ public class NeutronSubnet extends ConfigurationObject implements Serializable,
             try {
                 SubnetUtils util = new SubnetUtils(cidr);
                 SubnetInfo info = util.getInfo();
-                if (gatewayIP == null) {
+                if (gatewayIP == null || ("").equals(gatewayIP)) {
                     gatewayIP = info.getLowAddress();
                 }
                 if (allocationPools.size() < 1) {