cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject git commit: updated refs/heads/master-6-17-stable to c0af861
Date Mon, 17 Jun 2013 17:58:43 GMT
Updated Branches:
  refs/heads/master-6-17-stable fc16e29f9 -> c0af861a7


LOUDSTACK-2914: handle situation when serviceProvider map is empty


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

Branch: refs/heads/master-6-17-stable
Commit: c0af861a71e2adef916872522ee518b6a8e5df25
Parents: fc16e29
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Mon Jun 17 10:50:22 2013 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Mon Jun 17 10:58:38 2013 -0700

----------------------------------------------------------------------
 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/c0af861a/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 68745bf..12164a2 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -4007,7 +4007,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements
Configurati
             }
         }
         
-        if (serviceProviderMap.containsKey(Service.Lb) && !internalLb &&
!publicLb) {
+        if (serviceProviderMap != null && serviceProviderMap.containsKey(Service.Lb)
&& !internalLb && !publicLb) {
             //if not specified, default public lb to true
             publicLb = true;
         }


Mime
View raw message