Updated Branches: refs/heads/master 382391f27 -> 4495d456e
CLOUDSTACK-4830: fix build error Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4495d456 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4495d456 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4495d456 Branch: refs/heads/master Commit: 4495d456edffd03c2b0c96d3bf0f0d7b28807267 Parents: 382391f Author: Wei Zhou <w.z...@leaseweb.com> Authored: Thu Oct 31 11:50:01 2013 +0100 Committer: Wei Zhou <w.z...@leaseweb.com> Committed: Thu Oct 31 11:50:01 2013 +0100 ---------------------------------------------------------------------- server/src/com/cloud/api/query/QueryManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4495d456/server/src/com/cloud/api/query/QueryManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index 97aee99..f9d9c4f 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -352,7 +352,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { public ListResponse<UserResponse> searchForUsers(ListUsersCmd cmd) throws PermissionDeniedException { Pair<List<UserAccountJoinVO>, Integer> result = searchForUsersInternal(cmd); ListResponse<UserResponse> response = new ListResponse<UserResponse>(); - List<UserResponse> userResponses = ViewResponseHelper.createUserResponse(UserContext.current().getCaller().getDomainId(), + List<UserResponse> userResponses = ViewResponseHelper.createUserResponse(CallContext.current().getCallingAccount().getDomainId(), result.first().toArray(new UserAccountJoinVO[result.first().size()])); response.setResponses(userResponses, result.second()); return response;
