apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.11'

Browse Source 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2018-05-09 18:04:53 +05:30
commit f77b1a7d00
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/main/java/org/apache/cloudstack/api/response/GuestOSResponse.java
View File

@ -41,7 +41,7 @@ public class GuestOSResponse extends BaseResponse {
@SerializedName(ApiConstants.IS_USER_DEFINED) @SerializedName(ApiConstants.IS_USER_DEFINED)
@Param(description = "is the guest OS user defined") @Param(description = "is the guest OS user defined")
private String isUserDefined; private Boolean isUserDefined;
public String getId() { public String getId() {
return id; return id;
@ -67,11 +67,11 @@ public class GuestOSResponse extends BaseResponse {
this.description = description; this.description = description;
} }
public String getIsUserDefined() { public Boolean getIsUserDefined() {
return isUserDefined; return isUserDefined;
} }
public void setIsUserDefined(String isUserDefined) { public void setIsUserDefined(Boolean isUserDefined) {
this.isUserDefined = isUserDefined; this.isUserDefined = isUserDefined;
} }

2
server/src/main/java/com/cloud/api/ApiResponseHelper.java
View File

@ -3203,7 +3203,7 @@ public class ApiResponseHelper implements ResponseGenerator {
GuestOSResponse response = new GuestOSResponse(); GuestOSResponse response = new GuestOSResponse();
response.setDescription(guestOS.getDisplayName()); response.setDescription(guestOS.getDisplayName());
response.setId(guestOS.getUuid()); response.setId(guestOS.getUuid());
response.setIsUserDefined(Boolean.valueOf(guestOS.getIsUserDefined()).toString()); response.setIsUserDefined(guestOS.getIsUserDefined());
GuestOSCategoryVO category = ApiDBUtils.findGuestOsCategoryById(guestOS.getCategoryId()); GuestOSCategoryVO category = ApiDBUtils.findGuestOsCategoryById(guestOS.getCategoryId());
if (category != null) { if (category != null) {
response.setOsCategoryId(category.getUuid()); response.setOsCategoryId(category.getUuid());