From 9f49967365006db19df3dbbe57221ab61dd0fcfd Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <Alena.Prokharchyk@citrix.com>
Date: Thu, 1 Dec 2011 14:22:41 -0800
Subject: [PATCH] fixed listNetworks by projectId

---
 server/src/com/cloud/network/NetworkManagerImpl.java | 2 +-
 server/src/com/cloud/user/AccountManagerImpl.java    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 1f38d119bae..9c4a8769c0e 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1811,7 +1811,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
             throw new InvalidParameterValueException("Parameter subDomainAccess can be specified only with aclType=Domain");
         }
         Account owner = null;
-        if (cmd.getAccountName() != null && domainId != null) {
+        if ((cmd.getAccountName() != null && domainId != null) || cmd.getProjectId() != null) {
             owner = _accountMgr.finalizeOwner(caller, cmd.getAccountName(), domainId, cmd.getProjectId());
         } else {
             owner = caller;
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 957ab96c66b..3ad88af792c 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -1280,7 +1280,6 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
             
             return getAccount(project.getProjectAccountId());
         }
-        
 
         if (isAdmin(caller.getType()) && accountName != null && domainId != null) {
             Domain domain =  _domainMgr.getDomain(domainId);