network-refactor: merge stomped on a logical not'
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2d19f3b0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2d19f3b0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2d19f3b0 Branch: refs/heads/javelin Commit: 2d19f3b0523b808af67fc07c398fd7b93f45c6f5 Parents: 56cd809 Author: Chiradeep Vittal <[email protected]> Authored: Thu Jan 17 16:59:48 2013 -0800 Committer: Chiradeep Vittal <[email protected]> Committed: Thu Jan 17 16:59:48 2013 -0800 ---------------------------------------------------------------------- .../network/lb/LoadBalancingRulesManagerImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2d19f3b0/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 c771597..dfd5232 100755 --- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java +++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java @@ -1083,7 +1083,7 @@ public class LoadBalancingRulesManagerImpl<Type> implements LoadBalancingRulesMa // verify rule is supported by Lb provider of the network LoadBalancingRule loadBalancing = new LoadBalancingRule(newRule, new ArrayList<LbDestination>(), new ArrayList<LbStickinessPolicy>()); - if (validateRule(loadBalancing)) { + if (!validateRule(loadBalancing)) { throw new InvalidParameterValueException("LB service provider cannot support this rule"); }
