From 496bbeba882968b0332085510da60911047fddef Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Tue, 4 Jan 2011 22:31:36 -0800
Subject: [PATCH] Bug 7860: protected from NPE whhile console proxy public
 address is not set during startup process

---
 .../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 80bdc91acd5..0f248e55ae4 100644
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -311,6 +311,11 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
             return null;
         }
         
+        if(proxy.getPublicIpAddress() == null) {
+        	s_logger.warn("Assigned console proxy does not have a valid public IP address");
+        	return null;
+        }
+        
         return new ConsoleProxyInfo(proxy.isSslEnabled(), proxy.getPublicIpAddress(), _consoleProxyPort, proxy.getPort(), _configDao.getValue("consoleproxy.url.domain"));
     }