From d091bdd886ab57ca47a333228cfd537008222f0b Mon Sep 17 00:00:00 2001 From: alena Date: Thu, 11 Nov 2010 12:46:21 -0800 Subject: [PATCH] bug 7126: return true only when assignToLoadBalancer succeeded. status 7126: resolved fixed --- server/src/com/cloud/network/NetworkManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 085a7ac4e46..8d698a557da 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -1378,6 +1378,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag EventUtils.saveEvent(UserContext.current().getUserId(), loadBalancer.getAccountId(), level, type, description); } } + return true; } else { // Remove the instanceIds from the load balancer since there was a failure. Make sure to commit the // transaction here, otherwise the act of throwing the internal error exception will cause this @@ -1393,7 +1394,6 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag _loadBalancerDao.releaseFromLockTable(loadBalancerId); } } - return true; } @Override @DB