You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/08/22 18:43:02 UTC
git commit: CS-16123: applied the patch from
https://reviews.apache.org/r/6723/ original committer: Mice Xia
Updated Branches:
refs/heads/master a5248f1cf -> 4a2796d7c
CS-16123: applied the patch from https://reviews.apache.org/r/6723/
original committer: Mice Xia
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4a2796d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4a2796d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4a2796d7
Branch: refs/heads/master
Commit: 4a2796d7c7315cbff5341afb51247126d7cf6a56
Parents: a5248f1
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Wed Aug 22 09:38:14 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Wed Aug 22 09:39:19 2012 -0700
----------------------------------------------------------------------
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a2796d7/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 492e6a8..e06c843 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);
}