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 2013/07/29 22:56:20 UTC

git commit: updated refs/heads/master to e6ec613

Updated Branches:
  refs/heads/master a5503de1d -> e6ec6137a


CLOUDSTACK-3914: assignToLoadBalancer - return false, when empty vmIds list is passed in


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e6ec6137
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e6ec6137
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e6ec6137

Branch: refs/heads/master
Commit: e6ec6137abae006ee3fc73e03adc157d00cfa369
Parents: a5503de
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Jul 29 13:55:33 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Mon Jul 29 13:55:55 2013 -0700

----------------------------------------------------------------------
 .../src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6ec6137/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 3f7b70f..afbcfa0 100755
--- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
+++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -967,6 +967,11 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
         }
 
         List<UserVm> vmsToAdd = new ArrayList<UserVm>();
+        
+        if (instanceIds == null || instanceIds.isEmpty()) {
+            s_logger.warn("List of vms to assign to the lb, is empty");
+            return false;
+        }
 
         for (Long instanceId : instanceIds) {
             if (mappedInstanceIds.contains(instanceId)) {