From 1ac1bcb2f6a9dc3a4dda80a4095a1861cc0eb239 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 --- .../cloud/network/lb/LoadBalancingRulesManagerImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java index 6941f5ad639..21331070214 100755 --- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java +++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java @@ -738,15 +738,16 @@ 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()); - boolean perfomedIpAssoc = true; + performedIpAssoc = true; + } else { + _networkMgr.checkIpForService(ipAddressVO, Service.Lb); } - _networkMgr.checkIpForService(ipAddressVO, Service.Lb); } if (lb.getSourceIpAddressId() == null) {