Updated Branches:
  refs/heads/master 70fdf215e -> d118a3d76

Fixed the bug in xml response serializing (introduced while resolving merge 
conflict)


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

Branch: refs/heads/master
Commit: d118a3d764b23d93733c7602bda135f821e741a8
Parents: 70fdf21
Author: Alena Prokharchyk <[email protected]>
Authored: Wed Nov 7 17:17:17 2012 -0800
Committer: Alena Prokharchyk <[email protected]>
Committed: Wed Nov 7 17:17:17 2012 -0800

----------------------------------------------------------------------
 .../cloud/api/response/ApiResponseSerializer.java  |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d118a3d7/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 bdbf685..dc15763 100644
--- a/server/src/com/cloud/api/response/ApiResponseSerializer.java
+++ b/server/src/com/cloud/api/response/ApiResponseSerializer.java
@@ -240,7 +240,8 @@ public class ApiResponseSerializer {
                        
sb.append("</").append(serializedName.value()).append(">");
                     }
                 } else if (fieldValue instanceof Date) {
-                    
sb.append("<").append(">").append(BaseCmd.getDateString((Date) 
fieldValue)).append("</").append(serializedName.value()).append(">");           
     
+                    
sb.append("<").append(serializedName.value()).append(">").append(BaseCmd.getDateString((Date)
 fieldValue)).
+                    append("</").append(serializedName.value()).append(">");   
 
                 } else if (fieldValue instanceof IdentityProxy) {              
        
                        IdentityProxy idProxy = (IdentityProxy)fieldValue;
                        String id = (idProxy.getValue() != null ? 
String.valueOf(idProxy.getValue()) : "");

Reply via email to