Updated Branches:
refs/heads/4.0 92fdeb53b -> 515b60826
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/515b6082
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/515b6082
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/515b6082
Branch: refs/heads/4.0
Commit: 515b60826697a268a4f5d264f7af23113de42418
Parents: 92fdeb5
Author: Edison Su <su...@gmail.com>
Authored: Tue Sep 18 16:42:36 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Tue Sep 18 16:42:36 2012 -0700
----------------------------------------------------------------------
.../consoleproxy/ConsoleProxyManagerImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/515b6082/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.");
+ }
}
}
}