Updated Branches: refs/heads/master ea5be1376 -> 8845aae0b
CLOUDSTACK-4075: User unable to archive events Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8845aae0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8845aae0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8845aae0 Branch: refs/heads/master Commit: 8845aae0bc10474bf7dd59aea7be8a50ac40f9f5 Parents: ea5be13 Author: Sanjay Tripathi <[email protected]> Authored: Mon Aug 5 18:13:52 2013 +0530 Committer: Devdeep Singh <[email protected]> Committed: Mon Aug 5 20:01:40 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/server/ManagementServerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8845aae0/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 482b2c8..1ea1141 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -859,7 +859,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe boolean result =true; List<Long> permittedAccountIds = new ArrayList<Long>(); - if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL && caller.getType() == Account.ACCOUNT_TYPE_PROJECT) { + if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL || caller.getType() == Account.ACCOUNT_TYPE_PROJECT) { permittedAccountIds.add(caller.getId()); } else { DomainVO domain = _domainDao.findById(caller.getDomainId());
