commit f0ebb0596dd26c7156e96ce2fedb25bca2af75f1
author Min Chen <min.chen@citrix.com> Wed Jun 19 16:50:27 2013 -0700
committer Min Chen <min.chen@citrix.com> Wed Jun 19 16:50:27 2013 -0700
tree 029c4ed3f726cd5d6b14259a511867897ff95470
parent bd84005b4ee7524d5a7f2b893f77474da421dbea

CLOUDSTACK-3027:Object_Store_Refactor - Uploaded template S3
content-type is not appropriate

core/src/com/cloud/storage/template/S3TemplateDownloader.java

diff --git a/core/src/com/cloud/storage/template/S3TemplateDownloader.java b/core/src/com/cloud/storage/template/S3TemplateDownloader.java
index 7763423..340e0db 100644
--- a/core/src/com/cloud/storage/template/S3TemplateDownloader.java
+++ b/core/src/com/cloud/storage/template/S3TemplateDownloader.java
@@ -209,6 +209,13 @@
                 remoteSize = maxTemplateSizeInByte;
             }
 
+            // get content type
+            String contentType = null;
+            Header contentTypeHeader = request.getResponseHeader("Content-Type");
+            if ( contentTypeHeader != null ){
+                contentType = contentTypeHeader.getValue();
+            }
+
             InputStream in = !chunked ? new BufferedInputStream(request.getResponseBodyAsStream())
                     : new ChunkedInputStream(request.getResponseBodyAsStream());
 
@@ -225,6 +232,9 @@
             // download using S3 API
             ObjectMetadata metadata = new ObjectMetadata();
             metadata.setContentLength(remoteSize);
+            if ( contentType != null ){
+                metadata.setContentType(contentType);
+            }
             PutObjectRequest putObjectRequest = new PutObjectRequest(s3.getBucketName(), s3Key, in, metadata);
             // check if RRS is enabled
             if (s3.getEnableRRS()){