cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [03/12] git commit: updated refs/heads/4.3 to 8de4894
Date Wed, 26 Nov 2014 18:37:15 GMT
CLOUDSTACK-5865. Unable to use login API if domainId parameter is id and not uuid

(cherry picked from commit e5512960afa384245cfb9d012ac6482b2b7f8940)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/66091911
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/66091911
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/66091911

Branch: refs/heads/4.3
Commit: 66091911331cd9a8cc8c7cee39d8f9f1e866a1b4
Parents: 1e63d0b
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Tue Jan 14 13:45:50 2014 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Wed Nov 26 22:07:51 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/66091911/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 1311879..e39cc85 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -868,7 +868,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


Mime
View raw message