also take domainId into account

Author: resmo

server/src/main/java/org/apache/cloudstack/network/ssl/CertServiceImpl.java

@@ -132,7 +132,7 @@ public SslCertResponse uploadSslCert(final UploadSslCertCmd certCmd) {
         final Account caller = ctx.getCallingAccount();
 
         Account owner;
-        if (StringUtils.isNotBlank(certCmd.getAccountName()) || certCmd.getProjectId() != null) {
+        if ((StringUtils.isNotBlank(certCmd.getAccountName()) && certCmd.getDomainId() != null) || certCmd.getProjectId() != null) {
             owner = _accountMgr.finalizeOwner(caller, certCmd.getAccountName(), certCmd.getDomainId(), certCmd.getProjectId());
         } else {
             owner = caller;
@@ -228,7 +228,7 @@ public List<SslCertResponse> listSslCerts(final ListSslCertsCmd listSslCertCmd)
         }
 
         Account owner;
-        if (StringUtils.isNotBlank(accountName) || projectId != null) {
+        if ((StringUtils.isNotBlank(accountName) && domainId != null) || projectId != null) {
             owner = _accountMgr.finalizeOwner(caller, accountName, domainId, projectId);
         } else {
             owner = caller;