etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed a variable name broken by merge conflicts

This commit is contained in:
Will Stevens 2016-05-27 16:32:20 -04:00
parent 237bd46d55
commit 123e9f81ab
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/api/ApiServer.java
View File

@ -1003,7 +1003,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
final Map<String, Object[]> requestParameters) throws CloudAuthenticationException { 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 always use domainId first. If that does not exist, we will use domain name. If THAT doesn't exist
// we will default to ROOT // 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) { if (userDomain == null || userDomain.getId() < 1L) {
throw new CloudAuthenticationException("Unable to find the domain from the path " + domainPath); throw new CloudAuthenticationException("Unable to find the domain from the path " + domainPath);
} else { } else {