etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a NPE in AbstractStoragePoolAllocator.java when creating standalone volume

This commit is contained in:
Kelven Yang 2010-09-15 13:38:22 -07:00 committed by edison
parent 72e8b767fe
commit 2337a9d99f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java
View File

@ -146,9 +146,11 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement
}
/*hypervisor type is correct*/
// TODO : when creating a standalone volume, offering is passed as NULL, need to
// refine the logic of checking hypervisorType based on offering info
Long clusterId = pool.getClusterId();
ClusterVO cluster = _clusterDao.findById(clusterId);
if (!cluster.getHypervisorType().equalsIgnoreCase(offering.gethypervisorType())) {
if (offering != null && !cluster.getHypervisorType().equalsIgnoreCase(offering.gethypervisorType())) {
return false;
}
// check the used size against the total size, skip this host if it's greater than the configured