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 <rohit.ya...@shapeblue.com> 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 <rohit.ya...@shapeblue.com> Authored: Tue Sep 16 17:17:11 2014 +0200 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> 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);
