Updated Branches: refs/heads/master 0f976fd32 -> 868566133
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/86856613 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/86856613 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/86856613 Branch: refs/heads/master Commit: 86856613395bb0b3a04da51a58fa32599ecc023d Parents: 0f976fd Author: Alena Prokharchyk <[email protected]> Authored: Tue Oct 22 09:41:20 2013 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Tue Oct 22 09:48:46 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/86856613/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 ae93548..e37fcbe 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) {
