Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 23975109AC for ; Tue, 22 Oct 2013 16:48:30 +0000 (UTC) Received: (qmail 21493 invoked by uid 500); 22 Oct 2013 16:48:29 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 21428 invoked by uid 500); 22 Oct 2013 16:48:28 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 21417 invoked by uid 99); 22 Oct 2013 16:48:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Oct 2013 16:48:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5C99850D31; Tue, 22 Oct 2013 16:48:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alena1108@apache.org To: commits@cloudstack.apache.org Message-Id: <16b2ecaf58c6440b88a25745d3a9934e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 8685661 Date: Tue, 22 Oct 2013 16:48:28 +0000 (UTC) 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 Authored: Tue Oct 22 09:41:20 2013 -0700 Committer: Alena Prokharchyk 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 ipsToRelease = _ipAddressDao.listByAccount(accountId); for (IpAddress ip : ipsToRelease) {