From a72d419f8c8ccd4bfbcccad7977bb8fee5458409 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Tue, 14 Feb 2012 12:08:04 -0800
Subject: [PATCH] bug 13679: cosmetic fix to remove NPE warning message from
 log. Reviewed-By: anthony

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

diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 0455e60bccb..66eadd837a8 100755
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -1633,6 +1633,11 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
         try {
             long proxyVmId = startupCmd.getProxyVmId();
             ConsoleProxyVO consoleProxy = _consoleProxyDao.findById(proxyVmId);
+            if(consoleProxy == null) {
+                s_logger.info("Proxy " + proxyVmId + " is no longer in DB, skip sending startup command");
+                return;
+            }
+            
             assert (consoleProxy != null);
             HostVO consoleProxyHost = findConsoleProxyHostByName(consoleProxy.getHostName());