kvm: Throw a proper exception when pool could not be fetched from libvirt

wido · wido · commit 1ed0fe4ee710 · 2014-08-20T13:39:52.000+02:00
Otherwise NULL is returned and leads to a NPE further up the chain.
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
@@ -204,6 +204,8 @@ public KVMStoragePool getStoragePool(StoragePoolType type, String uuid) {
             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;

Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,8 @@ public KVMStoragePool getStoragePool(StoragePoolType type, String uuid) {`
`204`	`204`	`StoragePoolInformation info = _storagePools.get(uuid);`
`205`	`205`	`if (info != null) {`
`206`	`206`	`pool = createStoragePool(info.name, info.host, info.port, info.path, info.userInfo, info.poolType, info.type);`
	`207`	`+ } else {`
	`208`	`+ throw new CloudRuntimeException("Could not fetch storage pool " + uuid + " from libvirt");`
`207`	`209`	`}`
`208`	`210`	`}`
`209`	`211`	`return pool;`