From: faizan <md.faizan@tcs.com>
Date: Thu, 26 Jun 2014 04:28:34 +0000 (+0530)
Subject: Fixed for bug : 1171 - issue while creating subnet
X-Git-Tag: release/helium~382^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=14f3e1124c15c173bb1d2e7e16043ad4438be81c

Fixed for bug : 1171 - issue while creating subnet

Change-Id: Ibb102b6c1ec6d0ca70da3c279448998c02612a46
Signed-off-by: faizan <md.faizan@tcs.com>
---

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 ae84a72bba..f31b045e93 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
@@ -297,7 +297,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) {