From d8a235ee316af7d9b21ea62581c8b5c8925081d8 Mon Sep 17 00:00:00 2001
From: Nitin Mehta <nitin.mehta@citrix.com>
Date: Fri, 23 Nov 2012 14:11:51 +0530
Subject: [PATCH] CLOUDSTACK-2923: Delete Secondary storage of a Zone was
 giving NPE bcz we were still refering to the object. Instead log that the
 cpvm and ssvm cant be created bcz sec storage is not available

---
 .../com/cloud/consoleproxy/ConsoleProxyManagerImpl.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 421e53f75be..7362cf1e227 100755
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -945,6 +945,13 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
             VMTemplateVO template = _templateDao.findSystemVMTemplate(dataCenterId);
             HostVO secondaryStorageHost = this.templateMgr.getSecondaryStorageHost(dataCenterId);
             boolean templateReady = false;
+            
+            if (secondaryStorageHost == null) {
+                if (s_logger.isDebugEnabled()) {
+                    s_logger.debug("No secondary storage available in zone " + dataCenterId + ", wait until it is ready to launch secondary storage vm");
+                }
+                return false;
+            }
 
             if (template != null && secondaryStorageHost != null) {
                 VMTemplateHostVO templateHostRef = _vmTemplateHostDao.findByHostTemplate(secondaryStorageHost.getId(), template.getId());