apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 12987: Fix NPE for check cidr

Browse Source 
status 12987: resolved fixed
This commit is contained in:
Sheng Yang 2012-01-10 12:54:35 -08:00
parent e6080436cf
commit 3a6f94f108
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2022,6 +2022,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
if (zoneId == null) {
return;
}
if (cidr == null) {
return;
}
List<NetworkVO> networks = _networksDao.listByZone((long)zoneId);
Map<Long, String> networkToCidr = new HashMap<Long, String>();
for (NetworkVO network : networks) {
@ -2221,7 +2224,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
throw new InvalidParameterValueException("Cannot specify CIDR when using network offering with external firewall!");
}
checkVirtualNetworkCidrOverlap(zoneId, cidr);
if (cidr != null) {
checkVirtualNetworkCidrOverlap(zoneId, cidr);
}
Transaction txn = Transaction.currentTxn();
txn.start();