From 6eacc112221265bdbc5acbbd092f9be2ee872daf Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Fri, 5 Aug 2011 12:45:24 -0700
Subject: [PATCH] bug 10994: Fixed NPE in destroySystemVm api status 10994:
 resolved fixed

---
 server/src/com/cloud/api/ApiResponseHelper.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 135dc2873e6..0fb45aa819f 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -1174,7 +1174,10 @@ public class ApiResponseHelper implements ResponseGenerator {
             // for console proxies, add the active sessions
             if (vm.getType() == Type.ConsoleProxy) {
                 ConsoleProxyVO proxy = ApiDBUtils.findConsoleProxy(vm.getId());
-                vmResponse.setActiveViewerSessions(proxy.getActiveSession());
+                //proxy can be already destroyed
+                if (proxy != null) {
+                    vmResponse.setActiveViewerSessions(proxy.getActiveSession());
+                } 
             }
 
             DataCenter zone = ApiDBUtils.findZoneById(vm.getDataCenterIdToDeployIn());