From c9d9a18ace486d94b7658983b598673b21256a69 Mon Sep 17 00:00:00 2001 From: Kris McQueen Date: Tue, 26 Oct 2010 17:40:18 -0700 Subject: [PATCH] bug 6746: use loadbalancer name rather than the command's name for updating the load balancer; use the load balancer's account id rather than the load balancer id when searching for the load balancer owner status 6746: resolved fixed --- server/src/com/cloud/network/NetworkManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index aa80c79363d..74cd58de7e2 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -2130,7 +2130,7 @@ public class NetworkManagerImpl implements NetworkManager, DomainRouterService { Long loadBalancerId = cmd.getId(); String privatePort = cmd.getPrivatePort(); String algorithm = cmd.getAlgorithm(); - String name = cmd.getName(); + String name = cmd.getLoadBalancerName(); String description = cmd.getDescription(); Account account = UserContext.current().getAccount(); @@ -2148,7 +2148,7 @@ public class NetworkManagerImpl implements NetworkManager, DomainRouterService { } } - Account lbOwner = _accountDao.findById(loadBalancer.getId()); + Account lbOwner = _accountDao.findById(loadBalancer.getAccountId()); if (lbOwner == null) { throw new InvalidParameterValueException("Unable to update load balancer rule, cannot find owning account"); }