From 85d9de58d6512fdc2c17bf8fe7b0a87cb5a51ef7 Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <Alena.Prokharchyk@citrix.com>
Date: Mon, 21 Nov 2011 17:52:28 -0800
Subject: [PATCH] bug 12127: fixed releasing non-source nat ips status 12127:
 resolved fixed

---
 server/src/com/cloud/network/NetworkManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index dd05aa21f3e..1d14c7a449d 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1633,7 +1633,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
 
         Network associatedNetwork = getNetwork(ipVO.getAssociatedWithNetworkId());
 
-        if (areServicesSupportedInNetwork(associatedNetwork.getId(), Service.SourceNat)) {
+        if (ipVO.isSourceNat() && areServicesSupportedInNetwork(associatedNetwork.getId(), Service.SourceNat)) {
             throw new IllegalArgumentException("ip address is used for source nat purposes and can not be disassociated.");
         }