From 83b55b70405becae4b6dcbf2b8ad5195f706dacb Mon Sep 17 00:00:00 2001 From: anthony Date: Thu, 13 Jan 2011 14:06:22 -0800 Subject: [PATCH] bug 7911: in mysql, condition field != value doesn't return entries whose field is null status 7911: resolved fixed --- server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java | 4 +++- server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java index 62aaf948478..d6afa03b987 100755 --- a/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java +++ b/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java @@ -231,7 +231,9 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem TmpltsInZoneSearch = createSearchBuilder(); TmpltsInZoneSearch.and("removed", TmpltsInZoneSearch.entity().getRemoved(), SearchCriteria.Op.NULL); - TmpltsInZoneSearch.and("avoidtype", TmpltsInZoneSearch.entity().getTemplateType(), SearchCriteria.Op.NEQ); + TmpltsInZoneSearch.and().op("avoidtype", TmpltsInZoneSearch.entity().getTemplateType(), SearchCriteria.Op.NEQ); + TmpltsInZoneSearch.or("templateType", TmpltsInZoneSearch.entity().getTemplateType(), SearchCriteria.Op.NULL); + TmpltsInZoneSearch.cp(); TmpltsInZoneSearch.join("tmpltzone", tmpltZoneSearch, tmpltZoneSearch.entity().getTemplateId(), TmpltsInZoneSearch.entity().getId(), JoinBuilder.JoinType.INNER); tmpltZoneSearch.done(); TmpltsInZoneSearch.done(); diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 064b36c3dee..e5b57b175a3 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -1571,7 +1571,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager isPublic, featured, isExtractable, - null, + TemplateType.USER, null, null, requiresHvmValue,