Updated Branches: refs/heads/master cc92a4ce7 -> a01304e65
CLOUDSTACK-123: fix NPE Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a01304e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a01304e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a01304e6 Branch: refs/heads/master Commit: a01304e65b61887d248cbe0d6fc2fb37dcb42f1e Parents: cc92a4c Author: Edison Su <[email protected]> Authored: Tue Sep 18 16:42:36 2012 -0700 Committer: Edison Su <[email protected]> Committed: Tue Sep 18 16:43:05 2012 -0700 ---------------------------------------------------------------------- .../consoleproxy/ConsoleProxyManagerImpl.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a01304e6/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index 6de1463..38dfb06 100755 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -1184,7 +1184,11 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx } } else { if (s_logger.isDebugEnabled()) { - s_logger.debug("Zone host is ready, but console proxy template: " + template.getId() + " is not ready on secondary storage: " + secondaryStorageHost.getId()); + if (secondaryStorageHost != null) { + s_logger.debug("Zone host is ready, but console proxy template: " + template.getId() + " is not ready on secondary storage: " + secondaryStorageHost.getId()); + } else { + s_logger.debug("Zone host is ready, but console proxy template: " + template.getId() + " is not ready on secondary storage."); + } } } }
