cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aprat...@apache.org
Subject git commit: updated refs/heads/master to 77bec4f
Date Wed, 25 Sep 2013 15:40:12 GMT
Updated Branches:
  refs/heads/master 9fb0a1a61 -> 77bec4f2a


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/77bec4f2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/77bec4f2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/77bec4f2

Branch: refs/heads/master
Commit: 77bec4f2adf230a1b0b384922119892547ccc88a
Parents: 9fb0a1a
Author: Abhinandan Prateek <aprateek@apache.org>
Authored: Wed Sep 25 21:09:24 2013 +0530
Committer: Abhinandan Prateek <aprateek@apache.org>
Committed: Wed Sep 25 21:09:24 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/77bec4f2/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 3c77958..f23d57d 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -3770,7 +3770,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()));


Mime
View raw message