cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject [47/49] git commit: CS-16426 For network offerings with IP conserved mode off, LB/PF/StaticNAT rule creation fails if the first rule is firewall
Date Fri, 05 Oct 2012 22:32:46 GMT
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/2fc3d5fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2fc3d5fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2fc3d5fb

Branch: refs/heads/maven-to-rpm
Commit: 2fc3d5fbbce02c5658b2f9099810ad3fb56f656c
Parents: 4b99273
Author: Murali Reddy <Murali.Reddy@citrix.com>
Authored: Sun Sep 30 18:21:50 2012 +0530
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Sat Oct 6 00:30:25 2012 +0200

----------------------------------------------------------------------
 .../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/2fc3d5fb/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);
                 }


Mime
View raw message