From 606708e0a37c185a8e2f9708cb0b74926265ce11 Mon Sep 17 00:00:00 2001
From: abhi <abhinandan.prateek@citrix.com>
Date: Mon, 30 Jan 2012 18:10:37 +0530
Subject: [PATCH] bug 12849: remove agent will kickstart HA if the host status
 is Down or Alert. The update is therefore moved before it reviewed by: kishan

---
 server/src/com/cloud/agent/manager/AgentManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index 537cdc7d77b..bc76cc128dc 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -1110,8 +1110,8 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
         if (s_logger.isDebugEnabled()) {
             s_logger.debug("Deregistering link for " + hostId + " with state " + nextState);
         }
-        removeAgent(attache, nextState, event, investigate);
         _hostDao.disconnect(host, event, _nodeId);
+        removeAgent(attache, nextState, event, investigate);
 
         return true;
     }