You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/06/18 05:06:56 UTC
[31/50] [abbrv] git commit: updated refs/heads/vmsync to e2edae1
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/952fa246
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/952fa246
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/952fa246
Branch: refs/heads/vmsync
Commit: 952fa2464da9f10b63fbba869922ee735c231c42
Parents: bd69939
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Jun 17 10:50:22 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Mon Jun 17 10:55:33 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/952fa246/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;
}