Return-Path: X-Original-To: apmail-cloudstack-dev-archive@www.apache.org Delivered-To: apmail-cloudstack-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 898CA10A3B for ; Mon, 9 Dec 2013 13:32:21 +0000 (UTC) Received: (qmail 22659 invoked by uid 500); 9 Dec 2013 13:32:21 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 22498 invoked by uid 500); 9 Dec 2013 13:32:20 -0000 Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list dev@cloudstack.apache.org Received: (qmail 22488 invoked by uid 99); 9 Dec 2013 13:32:20 -0000 Received: from reviews-vm.apache.org (HELO reviews.apache.org) (140.211.11.40) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Dec 2013 13:32:20 +0000 Received: from reviews.apache.org (localhost [127.0.0.1]) by reviews.apache.org (Postfix) with ESMTP id E0BF71C4A24; Mon, 9 Dec 2013 13:32:19 +0000 (UTC) Content-Type: multipart/alternative; boundary="===============2885790207437017568==" MIME-Version: 1.0 Subject: Re: Review Request 15566: Remove the comparison between GuestOSCategoryVO.CATEGORY_NONE and guestOSCategory.getName() to make OS category of 'None' to be a valid option. From: "Yichi Lu" To: "daan Hoogland" Cc: "Yichi Lu" , "cloudstack" Date: Mon, 09 Dec 2013 13:32:19 -0000 Message-ID: <20131209133219.6245.71871@reviews.apache.org> X-ReviewBoard-URL: https://reviews.apache.org Auto-Submitted: auto-generated Sender: "Yichi Lu" X-ReviewGroup: cloudstack X-ReviewRequest-URL: https://reviews.apache.org/r/15566/ X-Sender: "Yichi Lu" References: <20131115053754.26301.29820@reviews.apache.org> In-Reply-To: <20131115053754.26301.29820@reviews.apache.org> Reply-To: "Yichi Lu" X-ReviewRequest-Repository: cloudstack-git --===============2885790207437017568== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/15566/ ----------------------------------------------------------- (Updated Dec. 9, 2013, 1:32 p.m.) Review request for cloudstack and daan Hoogland. Changes ------- updated patch against 4.4.0 Bugs: CLOUDSTACK-4969 https://issues.apache.org/jira/browse/CLOUDSTACK-4969 Repository: cloudstack-git Description ------- CLOUDSTACK-4969 In server/src/com/cloud/resource/ResourceManagerImpl.java near line 1264, there is a line: if (guestOSCategory != null && !GuestOSCategoryVO.CATEGORY_NONE.equalsIgnoreCase(guestOSCategory.getName())). But since GuestOSCategoryVO.CATEGORY_NONE = 'None' and guestOSCategory.getName() = 'None', this would cause OS category of 'None' to not be selected. Removing it does the job. Notice the OS category of 'None' at the top of the dropdown list does not have a valid guestOSCategoryid (and would be null). Diffs (updated) ----- server/src/com/cloud/resource/ResourceManagerImpl.java 7579b8f Diff: https://reviews.apache.org/r/15566/diff/ Testing ------- Tested against cloudstack GUI. Was able to change OS category to 'None', the bottom one, and change it back to other OS categories. Selecting the top 'None' would have no effect. Thanks, Yichi Lu --===============2885790207437017568==--