From f902a9fa1f66629fef74c281667e6ab7fe21e5b3 Mon Sep 17 00:00:00 2001 From: abhishek Date: Mon, 6 Dec 2010 13:59:27 -0800 Subject: [PATCH] fixing a bug encountered during the destroy vm op; we were returning back a guru based on the wrong type: vm instead of vm.getType() which resulted in a npe. --- server/src/com/cloud/vm/MauriceMoss.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/vm/MauriceMoss.java b/server/src/com/cloud/vm/MauriceMoss.java index 6faed9b5f6c..503a97cdfad 100644 --- a/server/src/com/cloud/vm/MauriceMoss.java +++ b/server/src/com/cloud/vm/MauriceMoss.java @@ -228,7 +228,7 @@ public class MauriceMoss implements VmManager, ClusterManagerListener { @SuppressWarnings("unchecked") private VirtualMachineGuru getVmGuru(T vm) { - return (VirtualMachineGuru)_vmGurus.get(vm); + return (VirtualMachineGuru)_vmGurus.get(vm.getType()); } @Override