Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DA9BD10404 for ; Mon, 17 Jun 2013 17:55:37 +0000 (UTC) Received: (qmail 27286 invoked by uid 500); 17 Jun 2013 17:55:37 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 27264 invoked by uid 500); 17 Jun 2013 17:55:37 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 27257 invoked by uid 99); 17 Jun 2013 17:55:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Jun 2013 17:55:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CEF918A610C; Mon, 17 Jun 2013 17:55:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alena1108@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 952fa24 Date: Mon, 17 Jun 2013 17:55:35 +0000 (UTC) Updated Branches: refs/heads/master bd699390a -> 952fa2464 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/master Commit: 952fa2464da9f10b63fbba869922ee735c231c42 Parents: bd69939 Author: Alena Prokharchyk Authored: Mon Jun 17 10:50:22 2013 -0700 Committer: Alena Prokharchyk 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; }