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 3CD3D104B2 for ; Fri, 12 Apr 2013 11:58:45 +0000 (UTC) Received: (qmail 2920 invoked by uid 500); 12 Apr 2013 11:58:39 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 2865 invoked by uid 500); 12 Apr 2013 11:58:39 -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 794 invoked by uid 99); 12 Apr 2013 11:58:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Apr 2013 11:58:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 857F2819585; Fri, 12 Apr 2013 11:58:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: commits@cloudstack.apache.org Date: Fri, 12 Apr 2013 11:59:03 -0000 Message-Id: In-Reply-To: <01bb2ac671e64923b32e7c204ceb4b7b@git.apache.org> References: <01bb2ac671e64923b32e7c204ceb4b7b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/50] [abbrv] git commit: updated refs/heads/marvin_refactor to 30e2971 ACl on affinity group Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fc248cb9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc248cb9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc248cb9 Branch: refs/heads/marvin_refactor Commit: fc248cb99c2febfa165e215dc2d2c38fddf980b5 Parents: 9de7a68 Author: Prachi Damle Authored: Mon Apr 8 13:27:18 2013 -0700 Committer: Prachi Damle Committed: Thu Apr 11 13:23:41 2013 -0700 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc248cb9/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 8b6ad3b..d281e5b 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2289,6 +2289,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use AffinityGroupVO ag = _affinityGroupDao.findById(affinityGroupId); if (ag == null) { throw new InvalidParameterValueException("Unable to find affinity group by id " + affinityGroupId); + } else { + // verify permissions + _accountMgr.checkAccess(caller, null, true, owner, ag); } } }