From a56e5ace886e87ecd3021d9c02270f53effd7488 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Tue, 25 Jan 2011 16:42:05 -0800
Subject: [PATCH] Bug 8102: CheckSshAnswer could be null

---
 .../com/cloud/consoleproxy/ConsoleProxyManagerImpl.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index d84cbc061f3..ada5d2cdaef 100644
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -1537,8 +1537,11 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
     @Override
     public boolean finalizeStart(VirtualMachineProfile<ConsoleProxyVO> profile, long hostId, Commands cmds, ReservationContext context) {
         CheckSshAnswer answer = (CheckSshAnswer)cmds.getAnswer("checkSsh");
-        if (!answer.getResult()) {
-            s_logger.warn("Unable to ssh to the VM: " + answer.getDetails());
+        if (answer == null || !answer.getResult()) {
+            if(answer != null)
+                s_logger.warn("Unable to ssh to the VM: " + answer.getDetails());
+            else
+                s_logger.warn("Unable to ssh to the VM: null answer");
             return false;
         }