etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing response generation for multipart upload

This commit is contained in:
Salvatore Orlando 2012-04-27 10:30:41 +01:00
parent df4eb587c2
commit 6821139896
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cloudbridge/.project
View File

@ -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>

3
cloudbridge/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java
View File

@ -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());