From d4d1b1c5a9f9b21c5b7f5f31dc5a2a11a9363b1a Mon Sep 17 00:00:00 2001 From: Koushik Das Date: Wed, 11 Jul 2012 14:19:29 +0530 Subject: [PATCH] Revert "Fix for CS-15345". This issue was caused due some bug in VPC related cleanup code. The bug got fixed as part of 3caffc7855d702f91a027f2fd9385f43ad992b95, so this is no longer needed. This reverts commit a8c1568b3757bb71dc0a9d087b98ac922e6c629c. --- server/src/com/cloud/network/NetworkManagerImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index be1648d94a2..72d203ee4c6 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -1307,11 +1307,8 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag s_logger.debug("Releasing ip id=" + addrId + "; sourceNat = " + ip.isSourceNat()); } - Network network = null; if (ip.getAssociatedWithNetworkId() != null) { - network = _networksDao.findById(ip.getAssociatedWithNetworkId()); - } - if (network != null) { + Network network = _networksDao.findById(ip.getAssociatedWithNetworkId()); try { if (!applyIpAssociations(network, true)) { s_logger.warn("Unable to apply ip address associations for " + network);