Cloudstack-2997: the maxconn setting is masked by wrong conditions
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2be36786 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2be36786 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2be36786 Branch: refs/heads/4.2 Commit: 2be3678602e71b723a241afbe1e2365618ade4fe Parents: 143fb72 Author: Abhinandan Prateek <aprat...@apache.org> Authored: Wed Sep 25 21:09:24 2013 +0530 Committer: Abhinandan Prateek <aprat...@apache.org> Committed: Wed Sep 25 21:14:45 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/configuration/ConfigurationManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2be36786/server/src/com/cloud/configuration/ConfigurationManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index d32c693..b09b8ca 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -4001,7 +4001,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } validateLoadBalancerServiceCapabilities(lbServiceCapabilityMap); - if (!serviceProviderMap.containsKey(Service.Lb) && lbServiceCapabilityMap != null && !lbServiceCapabilityMap.isEmpty()) { + if (lbServiceCapabilityMap != null && !lbServiceCapabilityMap.isEmpty()) { maxconn = cmd.getMaxconnections(); if (maxconn == null) { maxconn=Integer.parseInt(_configDao.getValue(Config.NetworkLBHaproxyMaxConn.key()));
