From 79f5ece7dc6c603ded3ab5faf3eb682960f1f44c Mon Sep 17 00:00:00 2001
From: Edison Su <edison@cloud.com>
Date: Wed, 6 Jul 2011 16:05:18 -0700
Subject: [PATCH] fix NPE in put primary storage into maintainance mode

---
 server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 0d99ec3a95c..067b638cdfd 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2808,7 +2808,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
 
     @Override
     public void finalizeStop(VirtualMachineProfile<UserVmVO> profile, StopAnswer answer) {
-        if("VM does not exist".equals(answer.getDetails())){
+        if(answer != null && "VM does not exist".equals(answer.getDetails())){
             // Stop answer returns true when Vm does not exist.
             // This is a hack to avoid logging usage events
             return;