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:40:59 UTC
git commit: updated refs/heads/4.3-forward to b811bc0
Updated Branches:
refs/heads/4.3-forward 62a259ffa -> b811bc094
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/b811bc09
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b811bc09
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b811bc09
Branch: refs/heads/4.3-forward
Commit: b811bc0945f9d028d814356b98ccd58c05f71793
Parents: 62a259f
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Fri Jan 31 17:03:02 2014 +0530
Committer: Sanjay Tripathi <sa...@citrix.com>
Committed: Fri Jan 31 17:03:47 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/b811bc09/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;