From 6821139896771890981d26a4bc3dbf44ee24f78a Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Fri, 27 Apr 2012 10:30:41 +0100
Subject: [PATCH] Fixing response generation for multipart upload

---
 cloudbridge/.project                          | 29 ++++++++++++++-----
 .../service/controller/s3/S3ObjectAction.java |  3 +-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/cloudbridge/.project b/cloudbridge/.project
index ee997735974..8a529071930 100644
--- a/cloudbridge/.project
+++ b/cloudbridge/.project
@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>cloudbridge</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
+       <name>cloudbridge</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.python.pydev.PyDevBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.python.pydev.pythonNature</nature>
+       </natures>
 </projectDescription>
+
diff --git a/cloudbridge/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java b/cloudbridge/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java
index 542859c0e8a..fc0966e22a2 100644
--- a/cloudbridge/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java
+++ b/cloudbridge/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java
@@ -777,12 +777,11 @@ public class S3ObjectAction implements ServletAction {
 		if ( 200 == result ) 
 	    {
  	 	     StringBuffer xml = new StringBuffer();
-             xml.append( "<?xml version=\"1.0\" encoding=\"utf-8\"?>" );
              xml.append( "<CompleteMultipartUploadResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">" );
              xml.append( "<Location>" ).append( "http://" + bucket + ".s3.amazonaws.com/" + key ).append( "</Location>" );
              xml.append( "<Bucket>" ).append( bucket ).append( "</Bucket>" );
              xml.append( "<Key>" ).append( key ).append( "</Key>" );
-             xml.append( "<ETag>\"" ).append( engineResponse.getETag()).append( "\"</<ETag>" );
+             xml.append( "<ETag>\"" ).append( engineResponse.getETag()).append( "\"</ETag>" );
              xml.append( "</CompleteMultipartUploadResult>" );
              String xmlString = xml.toString().replaceAll("^\\s+", "");   // Remove leading whitespace characters
              os.write( xmlString.getBytes());