cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [23/28] git commit: updated refs/heads/4.4 to 392dc81
Date Fri, 28 Mar 2014 00:39:32 GMT
CLOUDSTACK-5831: Fix NPE, in case the volume isn't attached to any pool


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

Branch: refs/heads/4.4
Commit: 36efe4dbf4e5d24c27f25a1f8057f1004d69c12f
Parents: 4584d5c
Author: edison <sudison@gmail.com>
Authored: Wed Jan 8 17:07:45 2014 -0800
Committer: Edison Su <sudison@gmail.com>
Committed: Thu Mar 27 17:38:40 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36efe4db/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 9d5914d..f2c7346 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -1642,6 +1642,10 @@ public class QueryManagerImpl extends ManagerBase implements QueryService
{
 
         for(VolumeResponse vr : volumeResponses) {
             String poolId = vr.getStoragePoolId();
+            if (poolId == null) {
+                continue;
+            }
+
             DataStore store = dataStoreManager.getPrimaryDataStore(poolId);
             if (store == null) {
                 continue;


Mime
View raw message