From 06221d18c39d10e0096e0480e26ec2a74cd29261 Mon Sep 17 00:00:00 2001
From: abhi <abhinandan.prateek@citrix.com>
Date: Tue, 31 Jan 2012 09:24:39 +0530
Subject: [PATCH] Revert "bug 12849: remove agent will kickstart HA if the host
 status is Down or Alert. The update is therefore moved before it"

This reverts commit 17bb6608dc4195e11d399457498b7edae2184b53.
---
 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 bc76cc128dc..537cdc7d77b 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);
         }
-        _hostDao.disconnect(host, event, _nodeId);
         removeAgent(attache, nextState, event, investigate);
+        _hostDao.disconnect(host, event, _nodeId);
 
         return true;
     }