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

CS-16123: applied the patch from https://reviews.apache.org/r/6723/ 

original committer: Mice Xia
This commit is contained in:
Alena Prokharchyk 2012-08-22 09:38:14 -07:00
parent a5248f1cfc
commit 4a2796d7c7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/network/vpc/VpcManagerImpl.java
View File

@ -1054,8 +1054,8 @@ public class VpcManagerImpl implements VpcManager, Manager{
for (Network ntwk : ntwks) {
assert (cidr != null) : "Why the network cidr is null when it belongs to vpc?";
if (NetUtils.isNetworkAWithinNetworkB(ntwk.getCidr(), vpc.getCidr())
|| NetUtils.isNetworkAWithinNetworkB(vpc.getCidr(), ntwk.getCidr())) {
if (NetUtils.isNetworkAWithinNetworkB(ntwk.getCidr(), cidr)
|| NetUtils.isNetworkAWithinNetworkB(cidr, ntwk.getCidr())) {
throw new InvalidParameterValueException("Network cidr " + cidr + " crosses other network cidr " + ntwk +
" belonging to the same vpc " + vpc);
}