You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/12/12 17:10:48 UTC
[1/2] git commit: updated refs/heads/master to aa92f5d
Repository: cloudstack
Updated Branches:
refs/heads/master 9c7f50aaa -> aa92f5d48
CLOUDSTACK-8067: Fixed NPEs in MS log related to console proxy VM
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1115bc9c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1115bc9c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1115bc9c
Branch: refs/heads/master
Commit: 1115bc9cc6ebf2b321bb5a3ff6958d649150cfe5
Parents: 528bc80
Author: Anshul Gangwar <an...@citrix.com>
Authored: Thu Dec 11 11:12:18 2014 +0530
Committer: Anshul Gangwar <an...@citrix.com>
Committed: Fri Dec 12 11:24:28 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/consoleproxy/AgentHookBase.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1115bc9c/server/src/com/cloud/consoleproxy/AgentHookBase.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/AgentHookBase.java b/server/src/com/cloud/consoleproxy/AgentHookBase.java
index 9864cae..8a5bae5 100644
--- a/server/src/com/cloud/consoleproxy/AgentHookBase.java
+++ b/server/src/com/cloud/consoleproxy/AgentHookBase.java
@@ -208,12 +208,13 @@ public abstract class AgentHookBase implements AgentHook {
HostVO consoleProxyHost = findConsoleProxyHost(startupCmd);
assert (consoleProxyHost != null);
-
- Answer answer = _agentMgr.send(consoleProxyHost.getId(), cmd);
- if (answer == null || !answer.getResult()) {
- s_logger.error("Console proxy agent reported that it failed to execute http handling startup command");
- } else {
- s_logger.info("Successfully sent out command to start HTTP handling in console proxy agent");
+ if (consoleProxyHost != null) {
+ Answer answer = _agentMgr.send(consoleProxyHost.getId(), cmd);
+ if (answer == null || !answer.getResult()) {
+ s_logger.error("Console proxy agent reported that it failed to execute http handling startup command");
+ } else {
+ s_logger.info("Successfully sent out command to start HTTP handling in console proxy agent");
+ }
}
}catch (NoSuchAlgorithmException e) {
s_logger.error("Unexpected exception in SecureRandom Algorithm selection ", e);
[2/2] git commit: updated refs/heads/master to aa92f5d
Posted by bh...@apache.org.
Merge remote-tracking branch 'anshulg/CLOUDSTACK-8067'
This closes #56
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aa92f5d4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aa92f5d4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aa92f5d4
Branch: refs/heads/master
Commit: aa92f5d4835b87d24a55e79c33c9fd072aee02da
Parents: 9c7f50a 1115bc9
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Dec 12 21:40:03 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Dec 12 21:40:21 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/consoleproxy/AgentHookBase.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------