You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by li...@apache.org on 2014/01/14 09:25:17 UTC
git commit: updated refs/heads/master to e551296
Updated Branches:
refs/heads/master 842b58d6e -> e5512960a
CLOUDSTACK-5865. Unable to use login API if domainId parameter is id and not uuid
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e5512960
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e5512960
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e5512960
Branch: refs/heads/master
Commit: e5512960afa384245cfb9d012ac6482b2b7f8940
Parents: 842b58d
Author: Likitha Shetty <li...@citrix.com>
Authored: Tue Jan 14 13:45:50 2014 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Tue Jan 14 13:47:27 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/api/ApiServer.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5512960/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 03361a4..a5314c9 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -760,7 +760,11 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
@Override
public Long fetchDomainId(String domainUUID) {
- return _domainMgr.getDomain(domainUUID).getId();
+ Domain domain = _domainMgr.getDomain(domainUUID);
+ if (domain != null)
+ return domain.getId();
+ else
+ return null;
}
@Override