From 6f26894eafce34cb2ba05285520cb5cf6cccc65a Mon Sep 17 00:00:00 2001
From: Abhinandan Prateek <aprateek@apache.org>
Date: Thu, 23 Aug 2012 12:13:53 +0530
Subject: [PATCH] =?UTF-8?q?Fix=20for=20a=20corner=20case=20during=20fullsy?=
 =?UTF-8?q?nc=20where=20it=20tolerates=20a=20VM=20to=20exist=20on=20two=20?=
 =?UTF-8?q?clusters=20by=20virtue=20of=20it=E2=80=99s=20current=20host=20i?=
 =?UTF-8?q?d=20and=20last=20host=20id=20(being=20on=20two=20diff=20cluster?=
 =?UTF-8?q?s).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java b/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
index db4ab1631f6..571b5d1841c 100644
--- a/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
+++ b/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
@@ -117,6 +117,7 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
         LHVMClusterSearch = createSearchBuilder();
         SearchBuilder<HostVO> hostSearch1 = _hostDao.createSearchBuilder();
         LHVMClusterSearch.join("hostSearch1", hostSearch1, hostSearch1.entity().getId(), LHVMClusterSearch.entity().getLastHostId(), JoinType.INNER);
+        LHVMClusterSearch.and("hostid", LHVMClusterSearch.entity().getHostId(), Op.NULL);
         hostSearch1.and("clusterId", hostSearch1.entity().getClusterId(), SearchCriteria.Op.EQ);
         LHVMClusterSearch.done();