Summary: small fix causing trouble when shutting down virtual machines
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/87fe6469 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/87fe6469 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/87fe6469 Branch: refs/heads/cloud-agent-with-openvswitch Commit: 87fe64695305d6a2c505f757ab7607b765c313b7 Parents: 1ceecc9 Author: Hugo Trippaers <[email protected]> Authored: Mon Jan 14 17:09:49 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Tue Jan 15 09:18:24 2013 +0100 ---------------------------------------------------------------------- .../kvm/storage/KVMStoragePoolManager.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/87fe6469/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 ac61127..1af2ed2 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 @@ -38,6 +38,10 @@ public class KVMStoragePoolManager { private final Map<String, StorageAdaptor> _storageMapper = new HashMap<String, StorageAdaptor>(); private StorageAdaptor getStorageAdaptor(StoragePoolType type) { + // type can be null: LibVirtComputingResource:3238 + if (type == null) { + return _storageMapper.get("libvirt"); + } StorageAdaptor adaptor = _storageMapper.get(type.toString()); if (adaptor == null) { // LibvirtStorageAdaptor is selected by default
