You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2014/01/31 12:49:19 UTC
git commit: updated refs/heads/master to e8438f1
Updated Branches:
refs/heads/master d578d7ef8 -> e8438f1b6
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 .
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e8438f1b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e8438f1b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e8438f1b
Branch: refs/heads/master
Commit: e8438f1b6df6dc0a3697148662a0dc5d7bd7996e
Parents: d578d7e
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Fri Jan 31 17:08:34 2014 +0530
Committer: Sanjay Tripathi <sa...@citrix.com>
Committed: Fri Jan 31 17:10:04 2014 +0530
----------------------------------------------------------------------
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/e8438f1b/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 4bffa3f..449e879 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -904,7 +904,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;
@@ -931,7 +931,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;