etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1952 from sgoeminn/CLOUDSTACK-9790 

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>
This commit is contained in:
Rajani Karuturi 2017-02-19 15:16:52 +05:30
parent d84347ba8c a01f7e76c3
commit 8bd33d3db6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -2919,7 +2919,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
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,