diff --git a/api/src/com/cloud/api/response/ListResponse.java b/api/src/com/cloud/api/response/ListResponse.java index fd8682ce077..4ad1649d6cd 100644 --- a/api/src/com/cloud/api/response/ListResponse.java +++ b/api/src/com/cloud/api/response/ListResponse.java @@ -22,5 +22,4 @@ public class ListResponse extends BaseResponse { return null; } } - } diff --git a/server/src/com/cloud/agent/AgentManager.java b/server/src/com/cloud/agent/AgentManager.java index 49ed2bb408b..a25b1d2bdae 100755 --- a/server/src/com/cloud/agent/AgentManager.java +++ b/server/src/com/cloud/agent/AgentManager.java @@ -231,5 +231,5 @@ public interface AgentManager extends Manager { Answer sendTo(Long dcId, HypervisorType type, Command cmd); - void notifyAnswersFromAttache(long agentId, long seq, Answer[] answers); + void notifyAnswersToMonitors(long agentId, long seq, Answer[] answers); } diff --git a/server/src/com/cloud/agent/manager/AgentAttache.java b/server/src/com/cloud/agent/manager/AgentAttache.java index 28edab4e9c3..df8dd17fbac 100644 --- a/server/src/com/cloud/agent/manager/AgentAttache.java +++ b/server/src/com/cloud/agent/manager/AgentAttache.java @@ -268,7 +268,7 @@ public abstract class AgentAttache { sendNext(seq); } - _agentMgr.notifyAnswersFromAttache(_id, seq, answers); + _agentMgr.notifyAnswersToMonitors(_id, seq, answers); return processed; } @@ -391,7 +391,7 @@ public abstract class AgentAttache { // s_logger.debug(log(seq, "Received after timeout: " + new Response(req, answers).toString())); } - _agentMgr.notifyAnswersFromAttache(_id, seq, answers); + _agentMgr.notifyAnswersToMonitors(_id, seq, answers); return answers; } diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java index 2f66193c279..08a9bbe4677 100755 --- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -485,9 +485,9 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, } } - public void notifyAnswersFromAttache(long agentId, long seq, Answer[] answers) { + public void notifyAnswersToMonitors(long agentId, long seq, Answer[] answers) { for (Pair listener : _cmdMonitors) { - listener.second().processCommands(agentId, seq, answers); + listener.second().processAnswers(agentId, seq, answers); } } @@ -1449,7 +1449,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Request req = new Request(seq, hostId, _nodeId, cmds, commands.stopOnError(), true, commands.revertOnError()); Answer[] answers = agent.send(req, timeout); - notifyAnswersFromAttache(hostId, seq, answers); + notifyAnswersToMonitors(hostId, seq, answers); commands.setAnswers(answers); return answers; }