From 66091911331cd9a8cc8c7cee39d8f9f1e866a1b4 Mon Sep 17 00:00:00 2001
From: Likitha Shetty <likitha.shetty@citrix.com>
Date: Tue, 14 Jan 2014 13:45:50 +0530
Subject: [PATCH] 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>
---
 server/src/com/cloud/api/ApiServer.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index 1311879b710..e39cc851423 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