From c009b56a607f6b40d9f851ca0d97adb9c879b859 Mon Sep 17 00:00:00 2001 From: Nitin Date: Fri, 5 Aug 2011 18:44:41 +0530 Subject: [PATCH] bug 6653: Extract Api's - No need to encode the url's forward slash with %2F as we have the latest version of gson which doesnt err out on forward slash anymore. status 6653: resolved fixed --- api/src/com/cloud/api/commands/ExtractVolumeCmd.java | 3 +-- server/src/com/cloud/api/ApiResponseHelper.java | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/api/src/com/cloud/api/commands/ExtractVolumeCmd.java b/api/src/com/cloud/api/commands/ExtractVolumeCmd.java index b471bcc54ad..61c770dd120 100755 --- a/api/src/com/cloud/api/commands/ExtractVolumeCmd.java +++ b/api/src/com/cloud/api/commands/ExtractVolumeCmd.java @@ -141,8 +141,7 @@ public class ExtractVolumeCmd extends BaseAsyncCmd { response.setUploadId(uploadId); response.setState(uploadInfo.getUploadState().toString()); response.setAccountId(getEntityOwnerId()); - //FIX ME - Need to set the url once the gson jar is upgraded since it is throwing an error right now. - response.setUrl(uploadInfo.getUploadUrl().replaceAll("/", "%2F")); + response.setUrl(uploadInfo.getUploadUrl()); this.setResponseObject(response); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to extract volume"); diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index ad9ca99977e..135dc2873e6 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -1631,9 +1631,7 @@ public class ApiResponseHelper implements ResponseGenerator { response.setUploadId(uploadId); response.setState(uploadInfo.getUploadState().toString()); response.setAccountId(accountId); - // FIX ME - Need to set the url once the gson jar is upgraded since it is throwing an error right now. - // response.setUrl(uploadInfo.getUploadUrl()); - response.setUrl(uploadInfo.getUploadUrl().replaceAll("/", "%2F")); + response.setUrl(uploadInfo.getUploadUrl()); return response; }