From 86856613395bb0b3a04da51a58fa32599ecc023d Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Tue, 22 Oct 2013 09:41:20 -0700
Subject: [PATCH] CLOUDSTACK-4743: durning the accountCleanup, never attempt to
 release the public ips when the guest networks of the account failed to
 cleanup

---
 server/src/com/cloud/user/AccountManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index ae93548b7e2..e37fcbe8b6d 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -697,7 +697,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
                 }
             }
 
-            if (vpcsDeleted) {
+            if (networksDeleted && vpcsDeleted) {
                 // release ip addresses belonging to the account
                 List<? extends IpAddress> ipsToRelease = _ipAddressDao.listByAccount(accountId);
                 for (IpAddress ip : ipsToRelease) {