From bb56a5d84069feb120036707b01dd33d210476fa Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Thu, 1 Sep 2011 17:33:11 -0700
Subject: [PATCH] put getConnection into try

---
 .../com/cloud/hypervisor/xen/resource/XenServer56Resource.java  | 2 +-
 server/src/com/cloud/ha/XenServerInvestigator.java              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
index 629a8647463..13120aa055a 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
@@ -277,8 +277,8 @@ public class XenServer56Resource extends CitrixResourceBase {
 
     @Override
     protected CheckOnHostAnswer execute(CheckOnHostCommand cmd) {
-        Connection conn = getConnection();
         try {
+            Connection conn = getConnection();
             String result = callHostPluginPremium(conn, "check_heartbeat", "host", cmd.getHost().getGuid(), "interval",
                     Integer.toString(_heartbeatInterval * 2));
             if (result == null) {
diff --git a/server/src/com/cloud/ha/XenServerInvestigator.java b/server/src/com/cloud/ha/XenServerInvestigator.java
index 23cabbf9ab7..57d70e1e06a 100644
--- a/server/src/com/cloud/ha/XenServerInvestigator.java
+++ b/server/src/com/cloud/ha/XenServerInvestigator.java
@@ -57,7 +57,7 @@ public class XenServerInvestigator extends AdapterBase implements Investigator {
                 continue;
             }
             Answer answer = _agentMgr.easySend(neighbor.getId(), cmd);
-            if (answer != null) {
+            if (answer != null && answer.getResult()) {
                 CheckOnHostAnswer ans = (CheckOnHostAnswer)answer;
                 if (!ans.isDetermined()) {
                     s_logger.debug("Host " + neighbor + " couldn't determine the status of " + agent);