From 87fe64695305d6a2c505f757ab7607b765c313b7 Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <trippie@gmail.com>
Date: Mon, 14 Jan 2013 17:09:49 +0100
Subject: [PATCH] Summary: small fix causing trouble when shutting down virtual
 machines

---
 .../cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java   | 4 ++++
 1 file changed, 4 insertions(+)

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 ac611275e5a..1af2ed22c27 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