Repository: cloudstack Updated Branches: refs/heads/4.3 ce5631553 -> 12aef675c
Remove the comparison between GuestOSCategoryVO.CATEGORY_NONE and guestOSCategory.getName() to make OS category of None to be a valid option. Signed-off-by: Daan Hoogland <[email protected]> (cherry picked from commit f194adb2ded586516f98e045bb318ca1af0730e5) Signed-off-by: Rohit Yadav <[email protected]> Conflicts: server/src/com/cloud/resource/ResourceManagerImpl.java Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/12aef675 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/12aef675 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/12aef675 Branch: refs/heads/4.3 Commit: 12aef675ce74a962d5f093a23aa6862d5aacd907 Parents: ce56315 Author: yichi.lu <[email protected]> Authored: Mon Dec 9 07:24:43 2013 -0600 Committer: Rohit Yadav <[email protected]> Committed: Wed Feb 4 14:55:13 2015 +0530 ---------------------------------------------------------------------- server/src/com/cloud/resource/ResourceManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/12aef675/server/src/com/cloud/resource/ResourceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index 6c20644..18ccbc9 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -1279,7 +1279,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, GuestOSCategoryVO guestOSCategory = _guestOSCategoryDao.findById(guestOSCategoryId); DetailVO guestOSDetail = _hostDetailsDao.findDetail(hostId, "guest.os.category.id"); - if (guestOSCategory != null && !GuestOSCategoryVO.CATEGORY_NONE.equalsIgnoreCase(guestOSCategory.getName())) { + if (guestOSCategory != null) { // Create/Update an entry for guest.os.category.id if (guestOSDetail != null) { guestOSDetail.setValue(String.valueOf(guestOSCategory.getId()));
