From 13fc4690fc39ebded2cf80895d8fd3a622c5b957 Mon Sep 17 00:00:00 2001
From: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Date: Tue, 23 Jul 2013 10:42:48 +0530
Subject: [PATCH] CLOUDSTACK-3488: listStoragePools throws NPE if any of the
 storage pools are not in the right state.

This issue is reporducible if user adds a primary storage and quickly fires
listStoragePool API command without waiting for the responce of previous
createStoragePool API command. So during this period
(before receiving createStoragePool API resonce), the primary srorage is in
initialized status and the "scope" of storage is not set.
---
 .../src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
index 503a5633035..bd370851157 100644
--- a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
@@ -75,7 +75,9 @@ public class StoragePoolJoinDaoImpl extends GenericDaoBase<StoragePoolJoinVO, Lo
         poolResponse.setPodId(pool.getPodUuid());
         poolResponse.setPodName(pool.getPodName());
         poolResponse.setCreated(pool.getCreated());
-        poolResponse.setScope(pool.getScope().toString());
+        if (pool.getScope() != null) {
+            poolResponse.setScope(pool.getScope().toString());
+        }
         if (pool.getHypervisor() != null) {
             poolResponse.setHypervisor(pool.getHypervisor().toString());
         }