From 0dfe603d485696e14aaf224c78f2b8c06fe4b8a2 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Tue, 3 Jul 2012 17:34:49 -0700 Subject: [PATCH] VPC: createLB rule - removed duplicated check for ip services when createLB rule Conflicts: server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java --- .../com/cloud/network/lb/LoadBalancingRulesManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java index 123149a4942..28e475baa21 100755 --- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java +++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java @@ -740,14 +740,14 @@ public class LoadBalancingRulesManagerImpl implements LoadBalancingRulesMa try { if (ipAddressVO != null) { if (ipAddressVO.getAssociatedWithNetworkId() == null) { - //set networkId just for verification purposes + //set networkId just for verification purposes ipAddressVO.setAssociatedWithNetworkId(lb.getNetworkId()); _networkMgr.checkIpForService(ipAddressVO, Service.Lb); s_logger.debug("The ip is not associated with the network id="+ lb.getNetworkId() + " so assigning"); ipAddressVO = _networkMgr.associateIPToGuestNetwork(ipAddrId, lb.getNetworkId()); performedIpAssoc = true; - } else { + } else { _networkMgr.checkIpForService(ipAddressVO, Service.Lb); } }