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

Fix NPE in checkVirtualNetworkCidrOverlap()

This commit is contained in:
Sheng Yang 2012-01-11 14:26:37 -08:00
parent db527555e1
commit c4677d5f80
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -2025,7 +2025,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
if (network.getGuestType() != GuestType.Isolated) {
continue;
}
networkToCidr.put(network.getId(), network.getCidr());
if (network.getCidr() != null) {
networkToCidr.put(network.getId(), network.getCidr());
}
}
if (networkToCidr == null || networkToCidr.isEmpty()) {
return;
@ -2041,7 +2043,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
long cidrSizeToUse = currCidrSize < ntwkCidrSize ? currCidrSize : ntwkCidrSize;
String ntwkCidrSubnet = NetUtils.getCidrSubNet(getCidrAddress(ntwkCidr), cidrSizeToUse);
String ntwkCidrSubnet = NetUtils.getCidrSubNet(ntwkCidrAddress, cidrSizeToUse);
String cidrSubnet = NetUtils.getCidrSubNet(currCidrAddress, cidrSizeToUse);
if (cidrSubnet.equals(ntwkCidrSubnet)) {