Merge pull request #1952 from sgoeminn/CLOUDSTACK-9790

karuturi · karuturi · commit 8bd33d3db655 · 2017-02-19T15:16:53.000+05:30
CLOUDSTACK-9790: fix NPE in case of Basic zone.This PR fixes the creation of a basic zone. https://issues.apache.org/jira/browse/CLOUDSTACK-9790 * pr/1952: CLOUDSTACK-9790: fix NPE in case of Basic zone. Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2919,7 +2919,7 @@ public Pair<Boolean, Pair<String, String>> validateIpRange(final String startIP,
                         ipv6, ip6Gateway, ip6Cidr, startIPv6, endIPv6, network);
                 if (sameSubnet) break;
             }
-        } else {
+        } else if(network.getGateway() != null && network.getCidr() != null) {
             vlanGateway = network.getGateway();
             vlanNetmask = NetUtils.getCidrNetmask(network.getCidr());
             sameSubnet = hasSameSubnet(ipv4, vlanGateway, vlanNetmask, newVlanGateway, newVlanNetmask, startIP, endIP,

Original file line number	Diff line number	Diff line change
`@@ -2919,7 +2919,7 @@ public Pair<Boolean, Pair<String, String>> validateIpRange(final String startIP,`
`2919`	`2919`	`ipv6, ip6Gateway, ip6Cidr, startIPv6, endIPv6, network);`
`2920`	`2920`	`if (sameSubnet) break;`
`2921`	`2921`	`}`
`2922`		`- } else {`
	`2922`	`+ } else if(network.getGateway() != null && network.getCidr() != null) {`
`2923`	`2923`	`vlanGateway = network.getGateway();`
`2924`	`2924`	`vlanNetmask = NetUtils.getCidrNetmask(network.getCidr());`
`2925`	`2925`	`sameSubnet = hasSameSubnet(ipv4, vlanGateway, vlanNetmask, newVlanGateway, newVlanNetmask, startIP, endIP,`