Repository: cloudstack Updated Branches: refs/heads/saml2 54986d58a -> ba68616f9 (forced update)
kvm: Throw a proper exception when pool could not be fetched from libvirt Otherwise NULL is returned and leads to a NPE further up the chain. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1ed0fe4e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1ed0fe4e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1ed0fe4e Branch: refs/heads/saml2 Commit: 1ed0fe4ee710d33bdb5c14704bc40de01f49d540 Parents: 14f3ad5 Author: Wido den Hollander <w...@widodh.nl> Authored: Wed Aug 20 13:39:52 2014 +0200 Committer: Wido den Hollander <w...@widodh.nl> Committed: Wed Aug 20 13:39:52 2014 +0200 ---------------------------------------------------------------------- .../com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1ed0fe4e/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java index 1d28804..f44bb03 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java @@ -204,6 +204,8 @@ public class KVMStoragePoolManager { StoragePoolInformation info = _storagePools.get(uuid); if (info != null) { pool = createStoragePool(info.name, info.host, info.port, info.path, info.userInfo, info.poolType, info.type); + } else { + throw new CloudRuntimeException("Could not fetch storage pool " + uuid + " from libvirt"); } } return pool;
