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 E177411272 for ; Tue, 16 Sep 2014 15:18:00 +0000 (UTC) Received: (qmail 69915 invoked by uid 500); 16 Sep 2014 15:18:00 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 69881 invoked by uid 500); 16 Sep 2014 15:18:00 -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 69871 invoked by uid 99); 16 Sep 2014 15:18:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Sep 2014 15:18:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5116BA1606B; Tue, 16 Sep 2014 15:18:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to fbbd2f8 Date: Tue, 16 Sep 2014 15:18:00 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 88c6072b4 -> fbbd2f893 CID-1233088: In case there is no GSLB SP, throw cloud exception Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fbbd2f89 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fbbd2f89 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fbbd2f89 Branch: refs/heads/master Commit: fbbd2f89322b1380956c269dcf6cd6b6b6b48410 Parents: 88c6072 Author: Rohit Yadav Authored: Tue Sep 16 17:17:11 2014 +0200 Committer: Rohit Yadav Committed: Tue Sep 16 17:17:11 2014 +0200 ---------------------------------------------------------------------- .../region/gslb/GlobalLoadBalancingRulesServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fbbd2f89/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java index 1d2c62b..6595e3f 100644 --- a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java +++ b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java @@ -687,7 +687,7 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR try { lookupGslbServiceProvider().applyGlobalLoadBalancerRule(zoneId.first(), zoneId.second(), gslbConfigCmd); - } catch (ResourceUnavailableException e) { + } catch (ResourceUnavailableException | NullPointerException e) { String msg = "Failed to configure GSLB rule in the zone " + zoneId.first() + " due to " + e.getMessage(); s_logger.warn(msg); throw new CloudRuntimeException(msg);