cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devd...@apache.org
Subject [1/3] git commit: updated refs/heads/4.2 to 567e4a8
Date Fri, 26 Jul 2013 10:21:13 GMT
Updated Branches:
  refs/heads/4.2 b46672900 -> 567e4a849


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.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f4eab352
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f4eab352
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f4eab352

Branch: refs/heads/4.2
Commit: f4eab352e04bdafc5307bd7aa21a4433c58ba871
Parents: b466729
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Tue Jul 23 10:42:48 2013 +0530
Committer: Devdeep Singh <devdeep@gmail.com>
Committed: Fri Jul 26 15:33:02 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4eab352/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
index 503a563..bd37085 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());
         }


Mime
View raw message