Updated Branches: refs/heads/master 446649248 -> 0c32466a7
CLOUDSTACK-3463: [Portable IP] [EIP/ELB Zone] EIP semantics are not intact with portable IP fix ensures that, on release of portable IP associated with 'EIP enabled' basic zone vm, a new system public IP is allocated and associated with the VM Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0c32466a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0c32466a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0c32466a Branch: refs/heads/master Commit: 0c32466a758ed7be643488d5cc7ec6d6e267da30 Parents: 4466492 Author: Murali Reddy <[email protected]> Authored: Mon Jul 15 09:50:41 2013 +0530 Committer: Murali Reddy <[email protected]> Committed: Mon Jul 15 09:52:45 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c32466a/server/src/com/cloud/network/NetworkServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index d4f9030..f8f6044 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -903,9 +903,6 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { boolean success = _networkMgr.disassociatePublicIpAddress(ipAddressId, userId, caller); if (success) { - if (ipVO.isPortable()) { - return success; - } Long networkId = ipVO.getAssociatedWithNetworkId(); if (networkId != null) { Network guestNetwork = getNetwork(networkId);
