Updated Branches: refs/heads/4.2 88882a914 -> 3b28f73be
CLOUDSTACK-4743: durning the accountCleanup, never attempt to release the public ips when the guest networks of the account failed to cleanup Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3b28f73b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3b28f73b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3b28f73b Branch: refs/heads/4.2 Commit: 3b28f73beae316ffea9adaf4aaf5240d60f23387 Parents: 88882a9 Author: Alena Prokharchyk <[email protected]> Authored: Tue Oct 22 09:41:20 2013 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Tue Oct 22 09:41:20 2013 -0700 ---------------------------------------------------------------------- server/src/com/cloud/user/AccountManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3b28f73b/server/src/com/cloud/user/AccountManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 71a2ae7..f935e97 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -691,7 +691,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) {
