From 4a2796d7c7315cbff5341afb51247126d7cf6a56 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 22 Aug 2012 09:38:14 -0700 Subject: [PATCH] CS-16123: applied the patch from https://reviews.apache.org/r/6723/ original committer: Mice Xia --- server/src/com/cloud/network/vpc/VpcManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index 492e6a81903..e06c843f8d6 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -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); }