From 668fde991c65e69c57502005da15e4c3d7712310 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Tue, 1 Feb 2011 13:04:42 -0800
Subject: [PATCH] Don't default resource owner to System account when command
 is executed via 8096 and account or domainId are missing

---
 server/src/com/cloud/user/AccountManagerImpl.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index fe96a51c930..5d6337bf4ad 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -1500,6 +1500,11 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
     }
     
     public Account finalizeOwner(Account caller, String accountName, Long domainId) {
+        //don't default the owner to the system account
+        if (caller.getId() == Account.ACCOUNT_ID_SYSTEM && (accountName == null || domainId == null)) {
+            throw new InvalidParameterValueException("Account and domainId are needed for resource creation");
+        }
+        
         if (isAdmin(caller.getType()) && accountName != null && domainId != null) {          
             DomainVO domain = _domainDao.findById(domainId);
             if (domain == null) {