Updated Branches: refs/heads/api_refactoring a9ab42d96 -> 39b829bff
api: ACL annotation and checkAccess removal refactor for StopVMCmd Signed-off-by: Rohit Yadav <bhais...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/39b829bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/39b829bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/39b829bf Branch: refs/heads/api_refactoring Commit: 39b829bffef0a21c9886074b1d0c42c3a83ea8b2 Parents: 96b9164 Author: Rohit Yadav <bhais...@apache.org> Authored: Sun Jan 6 17:19:49 2013 -0800 Committer: Rohit Yadav <bhais...@apache.org> Committed: Sun Jan 6 17:19:49 2013 -0800 ---------------------------------------------------------------------- .../cloudstack/api/command/user/vm/StopVMCmd.java | 1 + server/src/com/cloud/vm/UserVmManagerImpl.java | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/39b829bf/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java index af3bbaa..8e58906 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java @@ -39,6 +39,7 @@ public class StopVMCmd extends BaseAsyncCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// + @ACL @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType=UserVmResponse.class, required = true, description = "The ID of the virtual machine") private Long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/39b829bf/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 dd789f4..f3aca68 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2768,7 +2768,6 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager throw new InvalidParameterValueException("unable to find a virtual machine with id " + vmId); } - _accountMgr.checkAccess(caller, null, true, vm); UserVO user = _userDao.findById(userId); try {
