From feeffeaf10d845f0493c353fbc609e994483759a Mon Sep 17 00:00:00 2001
From: Murali Reddy <muralimmreddy@gmail.com>
Date: Mon, 15 Jul 2013 09:50:41 +0530
Subject: [PATCH] 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
---
 server/src/com/cloud/network/NetworkServiceImpl.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index d4f9030dfef..f8f604446a1 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);