Merge pull request #1 from scode/master

fulghum · fulghum · commit eb99084363ce · 2011-09-08T11:35:41.000-07:00
Avoid spurious warning when uploading empty file using an InputStream.
diff --git a/src/main/java/com/amazonaws/services/s3/AmazonS3Client.java b/src/main/java/com/amazonaws/services/s3/AmazonS3Client.java
@@ -944,7 +944,8 @@ public PutObjectResult putObject(PutObjectRequest putObjectRequest)
             request.addHeader(Headers.STORAGE_CLASS, putObjectRequest.getStorageClass());
         }
 
-        if (metadata.getContentLength() <= 0) {
+        // Use internal interface to differentiate 0 from unset.
+        if (metadata.getRawMetadata().get(Headers.CONTENT_LENGTH) == null) {
             /*
              * There's nothing we can do except for let the HTTP client buffer
              * the input stream contents if the caller doesn't tell us how much

Original file line number	Diff line number	Diff line change
`@@ -944,7 +944,8 @@ public PutObjectResult putObject(PutObjectRequest putObjectRequest)`
`944`	`944`	`request.addHeader(Headers.STORAGE_CLASS, putObjectRequest.getStorageClass());`
`945`	`945`	`}`
`946`	`946`
`947`		`- if (metadata.getContentLength() <= 0) {`
	`947`	`+ // Use internal interface to differentiate 0 from unset.`
	`948`	`+ if (metadata.getRawMetadata().get(Headers.CONTENT_LENGTH) == null) {`
`948`	`949`	`/*`
`949`	`950`	`* There's nothing we can do except for let the HTTP client buffer`
`950`	`951`	`* the input stream contents if the caller doesn't tell us how much`