CLOUDSTACK-6965: fixed the NullPointerException introduced by fix for cloudstack

anshulgangwar · devdeep · commit bbcffbbab099 · 2014-06-23T12:17:08.000+05:30
6935 in AbstractStoragePoolAllocator#filter method for Zone Wide storage
diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
@@ -27,11 +27,12 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
 import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
-import org.apache.log4j.Logger;
 
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.dao.ClusterDao;
@@ -171,10 +172,17 @@ protected boolean filter(ExcludeList avoid, StoragePool pool, DiskProfile dskCh,
         }
 
         Long clusterId = pool.getClusterId();
-        ClusterVO cluster = _clusterDao.findById(clusterId);
-        if (!(cluster.getHypervisorType() == dskCh.getHypervisorType())) {
+        if (clusterId != null) {
+            ClusterVO cluster = _clusterDao.findById(clusterId);
+            if (!(cluster.getHypervisorType() == dskCh.getHypervisorType())) {
+                if (s_logger.isDebugEnabled()) {
+                    s_logger.debug("StoragePool's Cluster does not have required hypervisorType, skipping this pool");
+                }
+                return false;
+            }
+        } else if (pool.getHypervisor() != null && !(pool.getHypervisor() == dskCh.getHypervisorType())) {
             if (s_logger.isDebugEnabled()) {
-                s_logger.debug("StoragePool's Cluster does not have required hypervisorType, skipping this pool");
+                s_logger.debug("StoragePool does not have required hypervisorType, skipping this pool");
             }
             return false;
         }
