You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/06 20:11:02 UTC
[11/11] git commit: VPC: createLB rule - removed duplicated check for
ip services when createLB rule
VPC: createLB rule - removed duplicated check for ip services when createLB rule
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0dfe603d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0dfe603d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0dfe603d
Branch: refs/heads/vpc
Commit: 0dfe603d485696e14aaf224c78f2b8c06fe4b8a2
Parents: 31f9d71
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Tue Jul 3 17:34:49 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Jul 6 11:07:26 2012 -0700
----------------------------------------------------------------------
.../network/lb/LoadBalancingRulesManagerImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0dfe603d/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
index 123149a..28e475b 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<Type> 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);
}
}