Updated Branches: refs/heads/4.2 cb6ff00ef -> e0c6073a8
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/e0c6073a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e0c6073a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e0c6073a Branch: refs/heads/4.2 Commit: e0c6073a80ef5c1c8cff19b86289dc872b1b36f7 Parents: cb6ff00 Author: Sanjay Tripathi <[email protected]> Authored: Mon Aug 5 18:13:52 2013 +0530 Committer: Devdeep Singh <[email protected]> Committed: Mon Aug 5 19:47:36 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/e0c6073a/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 a181553..e534be0 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -838,7 +838,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());
