From fbbd2f89322b1380956c269dcf6cd6b6b6b48410 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Tue, 16 Sep 2014 17:17:11 +0200
Subject: [PATCH] CID-1233088: In case there is no GSLB SP, throw cloud
 exception

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 .../region/gslb/GlobalLoadBalancingRulesServiceImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
index 1d2c62bf630..6595e3f8325 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);