cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject git commit: updated refs/heads/master to c3680cc
Date Wed, 08 Jan 2014 23:38:32 GMT
Updated Branches:
  refs/heads/master 7003f0b0d -> c3680cc11


CLOUDSTACK-5839: fixed xml serializer to process collection field when its elements are of
String type


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c3680cc1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c3680cc1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c3680cc1

Branch: refs/heads/master
Commit: c3680cc111c3d43838da298aa6f639b84eb43b5f
Parents: 7003f0b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Wed Jan 8 15:38:08 2014 -0800
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Wed Jan 8 15:38:50 2014 -0800

----------------------------------------------------------------------
 .../src/com/cloud/api/response/ApiResponseSerializer.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c3680cc1/server/src/com/cloud/api/response/ApiResponseSerializer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/response/ApiResponseSerializer.java b/server/src/com/cloud/api/response/ApiResponseSerializer.java
index 6cdf6c6..d8b728a 100644
--- a/server/src/com/cloud/api/response/ApiResponseSerializer.java
+++ b/server/src/com/cloud/api/response/ApiResponseSerializer.java
@@ -26,11 +26,6 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.log4j.Logger;
-
-import com.google.gson.Gson;
-import com.google.gson.annotations.SerializedName;
-
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.ResponseObject;
@@ -39,6 +34,7 @@ import org.apache.cloudstack.api.response.CreateCmdResponse;
 import org.apache.cloudstack.api.response.ExceptionResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.log4j.Logger;
 
 import com.cloud.api.ApiDBUtils;
 import com.cloud.api.ApiResponseGsonHelper;
@@ -46,6 +42,8 @@ import com.cloud.api.ApiServer;
 import com.cloud.utils.encoding.URLEncoder;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.exception.ExceptionProxyObject;
+import com.google.gson.Gson;
+import com.google.gson.annotations.SerializedName;
 
 public class ApiResponseSerializer {
     private static final Logger s_logger = Logger.getLogger(ApiResponseSerializer.class.getName());
@@ -241,6 +239,8 @@ public class ApiResponseSerializer {
                             if (idFieldName != null) {
                                 sb.append("<" + "uuidProperty" + ">" + idFieldName
+ "</" + "uuidProperty" + ">");
                             }
+                        } else if (value instanceof String) {
+                            sb.append("<").append(serializedName.value()).append(">").append(value).append("</").append(serializedName.value()).append(">");
                         }
                     }
                     if (usedUuidList) {


Mime
View raw message