etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix for CS-15345". This issue was caused due some bug in VPC related cleanup code. The bug got fixed as part of 3caffc7855, so this is no longer needed. 

This reverts commit a8c1568b37.
This commit is contained in:
Koushik Das 2012-07-11 14:19:29 +05:30
parent 3070289266
commit d4d1b1c5a9
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -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);