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 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4e1f3f94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4e1f3f94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4e1f3f94 Branch: refs/heads/master Commit: 4e1f3f9410982201e8b03b848177ab52a7be6c0e Parents: e8fd65d Author: Murali Reddy <[email protected]> Authored: Sun Sep 30 18:21:50 2012 +0530 Committer: Sheng Yang <[email protected]> Committed: Wed Oct 3 17:18:00 2012 -0700 ---------------------------------------------------------------------- .../src/com/cloud/network/NetworkManagerImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4e1f3f94/server/src/com/cloud/network/NetworkManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 0cb61d5..a5ee6a3 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); }
