From ce60cfee85b8ecbb297b1dbf717b46a7d1133efa Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Mon, 29 Oct 2012 11:16:46 -0700
Subject: [PATCH] CS-16585: cloudstack 3.0 API - listProjects API - throw an
 API error if account is specified but domain is not.

---
 server/src/com/cloud/projects/ProjectManagerImpl.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server/src/com/cloud/projects/ProjectManagerImpl.java b/server/src/com/cloud/projects/ProjectManagerImpl.java
index 4fa520c88d7..dd230093280 100755
--- a/server/src/com/cloud/projects/ProjectManagerImpl.java
+++ b/server/src/com/cloud/projects/ProjectManagerImpl.java
@@ -382,6 +382,12 @@ public class ProjectManagerImpl implements ProjectManager, Manager{
                     accountId = owner.getId();
                 }
             }
+            else { //domainId == null
+            	if (accountName != null) {            		
+                    throw new InvalidParameterValueException("could not find account " + accountName + " because domain is not specified", null);            		
+            	}
+            	
+            }
         } else {
             if (accountName != null && !accountName.equals(caller.getAccountName())) {
                 throw new PermissionDeniedException("Can't list account " + accountName + " projects; unauthorized");