From 434258080f2dad95bbdbdd67f9517af2eac1cf85 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 18 Dec 2012 17:15:00 -0800 Subject: [PATCH] api: Fix NullPointerException in ApiResponseHelper for DomainResponse Signed-off-by: Rohit Yadav --- server/src/com/cloud/api/ApiResponseHelper.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 27fb6470d3b..8fa8bad13d3 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -440,7 +440,10 @@ public class ApiResponseHelper implements ResponseGenerator { domainResponse.setId(domain.getUuid()); domainResponse.setLevel(domain.getLevel()); domainResponse.setNetworkDomain(domain.getNetworkDomain()); - domainResponse.setParentDomainId(ApiDBUtils.findDomainById(domain.getParent()).getUuid()); + Domain parentDomain = ApiDBUtils.findDomainById(domain.getParent()); + if (parentDomain != null) { + domainResponse.setParentDomainId(parentDomain.getUuid()); + } StringBuilder domainPath = new StringBuilder("ROOT"); (domainPath.append(domain.getPath())).deleteCharAt(domainPath.length() - 1); domainResponse.setPath(domainPath.toString());