You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2013/12/09 15:48:47 UTC
git commit: updated refs/heads/master to f194adb
Updated Branches:
refs/heads/master 6b70a6db9 -> f194adb2d
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 <dh...@schubergphilis.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f194adb2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f194adb2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f194adb2
Branch: refs/heads/master
Commit: f194adb2ded586516f98e045bb318ca1af0730e5
Parents: 6b70a6d
Author: yichi.lu <yi...@sungard.com>
Authored: Mon Dec 9 07:24:43 2013 -0600
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Mon Dec 9 15:48:34 2013 +0100
----------------------------------------------------------------------
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/f194adb2/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 7579b8f..7c5041b 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -1264,7 +1264,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
GuestOSCategoryVO guestOSCategory = _guestOSCategoryDao.findById(guestOSCategoryId);
Map<String, String> hostDetails = _hostDetailsDao.findDetails(hostId);
- if (guestOSCategory != null && !GuestOsCategory.CATEGORY_NONE.equalsIgnoreCase(guestOSCategory.getName())) {
+ if (guestOSCategory != null) {
// Save a new entry for guest.os.category.id
hostDetails.put("guest.os.category.id", String.valueOf(guestOSCategory.getId()));
} else {