Repository: cloudstack Updated Branches: refs/heads/master 237bd46d5 -> 123e9f81a
fixed a variable name broken by merge conflicts Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/123e9f81 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/123e9f81 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/123e9f81 Branch: refs/heads/master Commit: 123e9f81ab2740340f31e39f1784c660fcf42f90 Parents: 237bd46 Author: Will Stevens <[email protected]> Authored: Fri May 27 16:32:20 2016 -0400 Committer: Will Stevens <[email protected]> Committed: Fri May 27 16:32:20 2016 -0400 ---------------------------------------------------------------------- server/src/com/cloud/api/ApiServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/123e9f81/server/src/com/cloud/api/ApiServer.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java index 9c296cb..0651d16 100644 --- a/server/src/com/cloud/api/ApiServer.java +++ b/server/src/com/cloud/api/ApiServer.java @@ -1003,7 +1003,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer final Map<String, Object[]> requestParameters) throws CloudAuthenticationException { // We will always use domainId first. If that does not exist, we will use domain name. If THAT doesn't exist // we will default to ROOT - final Domain userDomain = _domainMgr.findDomainByIdOrPath(domainId, domainPath); + final Domain userDomain = domainMgr.findDomainByIdOrPath(domainId, domainPath); if (userDomain == null || userDomain.getId() < 1L) { throw new CloudAuthenticationException("Unable to find the domain from the path " + domainPath); } else {
