From 4e1f3f9410982201e8b03b848177ab52a7be6c0e Mon Sep 17 00:00:00 2001
From: Murali Reddy <Murali.Reddy@citrix.com>
Date: Sun, 30 Sep 2012 18:21:50 +0530
Subject: [PATCH] CS-16426 For network offerings with IP conserved mode off,
 LB/PF/StaticNAT rule creation fails if the first rule is firewall

fixes, accidental modification of network services map object corresponding to a public IP
---
 server/src/com/cloud/network/NetworkManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 0cb61d59d87..a5ee6a3e095 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -878,7 +878,8 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
         NetworkOffering offering = _networkOfferingDao.findById(network.getNetworkOfferingId());
         if (!offering.isConserveMode()) {
             for (PublicIp ip : ipToServices.keySet()) {
-                Set<Service> services = ipToServices.get(ip);
+                Set<Service> services = new HashSet<Service>() ;
+                services.addAll(ipToServices.get(ip));
                 if (services != null && services.contains(Service.Firewall)) {
                     services.remove(Service.Firewall);
                 }