Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 751F4108EA for ; Mon, 24 Jun 2013 09:22:18 +0000 (UTC) Received: (qmail 75201 invoked by uid 500); 24 Jun 2013 09:22:18 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 75185 invoked by uid 500); 24 Jun 2013 09:22:16 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 75146 invoked by uid 99); 24 Jun 2013 09:22:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Jun 2013 09:22:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3FBB831476D; Mon, 24 Jun 2013 09:22:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jayapal@apache.org To: commits@cloudstack.apache.org Date: Mon, 24 Jun 2013 09:22:19 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] git commit: updated refs/heads/master-6-17-stable to 4f75062 CLOUDSTACK-3148 failed to create private gw with default acl id Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f750626 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f750626 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f750626 Branch: refs/heads/master-6-17-stable Commit: 4f75062648da8e56bd53aaddefd2798eca7293f3 Parents: 95ee285 Author: Jayapal Authored: Mon Jun 24 12:56:27 2013 +0530 Committer: Jayapal Committed: Mon Jun 24 14:30:23 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f750626/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 fb9e9b7..93413b4 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -1389,7 +1389,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis if ( aclVO == null) { throw new InvalidParameterValueException("Invalid network acl id passed "); } - if (aclVO.getVpcId() != vpcId ) { + if ((aclVO.getVpcId() != vpcId) && !(aclId == NetworkACL.DEFAULT_DENY || aclId == NetworkACL.DEFAULT_ALLOW)) { throw new InvalidParameterValueException("Private gateway and network acl are not in the same vpc"); }