CLOUDSTACK-5566: "Entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@aeb3d75 and entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@5a0fd1ec belong to different accounts" message while deleting multiple events . (cherry picked from commit b811bc0945f9d028d814356b98ccd58c05f71793)
Signed-off-by: Animesh Chaturvedi <anim...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c0e70b51 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c0e70b51 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c0e70b51 Branch: refs/heads/4.3 Commit: c0e70b51fc506bd211b1373b74ac340d2cd12f56 Parents: 5480a81 Author: Sanjay Tripathi <sanjay.tripa...@citrix.com> Authored: Fri Jan 31 17:03:02 2014 +0530 Committer: Animesh Chaturvedi <anim...@apache.org> Committed: Sun Feb 2 16:09:52 2014 -0800 ---------------------------------------------------------------------- server/src/com/cloud/server/ManagementServerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0e70b51/server/src/com/cloud/server/ManagementServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 048e183..3744cb3 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -908,7 +908,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe List<EventVO> events = _eventDao.listToArchiveOrDeleteEvents(ids, cmd.getType(), cmd.getStartDate(), cmd.getEndDate(), permittedAccountIds); ControlledEntity[] sameOwnerEvents = events.toArray(new ControlledEntity[events.size()]); - _accountMgr.checkAccess(CallContext.current().getCallingAccount(), null, true, sameOwnerEvents); + _accountMgr.checkAccess(CallContext.current().getCallingAccount(), null, false, sameOwnerEvents); if (ids != null && events.size() < ids.size()) { result = false; @@ -935,7 +935,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe List<EventVO> events = _eventDao.listToArchiveOrDeleteEvents(ids, cmd.getType(), cmd.getStartDate(), cmd.getEndDate(), permittedAccountIds); ControlledEntity[] sameOwnerEvents = events.toArray(new ControlledEntity[events.size()]); - _accountMgr.checkAccess(CallContext.current().getCallingAccount(), null, true, sameOwnerEvents); + _accountMgr.checkAccess(CallContext.current().getCallingAccount(), null, false, sameOwnerEvents); if (ids != null && events.size() < ids.size()) { result = false;
