Fix NPE while deleting domain

Author: ravening

engine/schema/src/main/java/com/cloud/user/AccountDetailsDaoImpl.java

@@ -19,6 +19,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import javax.inject.Inject;
 
@@ -133,17 +134,19 @@ public String getConfigValue(long id, ConfigKey<?> key) {
         // check if we can traverse till ROOT domain to get the value
         String enableDomainSettingsForChildDomain = _configDao.getValue("enable.domain.settings.for.child.domain");
         if (Boolean.parseBoolean(enableDomainSettingsForChildDomain)) {
-            AccountVO account = _accountDao.findById(id);
-            DomainVO domain = _domainDao.findById(account.getDomainId());
-            while (domain != null) {
-                DomainDetailVO domainVO = _domainDetailsDao.findDetail(domain.getId(), key.key());
-                if (domainVO != null) {
-                    value = domainVO.getValue();
-                    break;
-                } else if (domain.getParent() != null) {
-                    domain = _domainDao.findById(domain.getParent());
-                } else {
-                    break;
+            Optional<AccountVO> account = Optional.ofNullable(_accountDao.findById(id));
+            if (account.isPresent()) {
+                DomainVO domain = _domainDao.findById(account.get().getDomainId());
+                while (domain != null) {
+                    DomainDetailVO domainVO = _domainDetailsDao.findDetail(domain.getId(), key.key());
+                    if (domainVO != null) {
+                        value = domainVO.getValue();
+                        break;
+                    } else if (domain.getParent() != null) {
+                        domain = _domainDao.findById(domain.getParent());
+                    } else {
+                        break;
+                    }
                 }
             }
         }