Fix bug in ChecksumCalculatingInputStream

Author: varunnvs92

.changes/next-release/bugfix-AmazonS3-5df5cc4.json

@@ -0,0 +1,5 @@
+{
+    "category": "Amazon S3", 
+    "type": "bugfix", 
+    "description": "S3 putObject API using UrlConnectionHttpClient goes into infinite loop. See https://github.com/aws/aws-sdk-java-v2/pull/942 for more details."
+}

http-clients/url-connection-client/pom.xml

@@ -55,6 +55,35 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3</artifactId>
+            <version>${awsjavasdk.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <artifactId>service-test-utils</artifactId>
+            <groupId>software.amazon.awssdk</groupId>
+            <version>${awsjavasdk.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>sdk-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>regions</artifactId>
+            <version>${awsjavasdk.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/S3WithUrlHttpClientIntegrationTest.java

@@ -0,0 +1,111 @@
+/*
+ * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.http.urlconnection;
+
+import static software.amazon.awssdk.testutils.service.AwsTestBase.CREDENTIALS_PROVIDER_CHAIN;
+
+import org.assertj.core.api.Assertions;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.CreateBucketConfiguration;
+import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
+import software.amazon.awssdk.services.s3.model.DeleteBucketRequest;
+import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+
+public class S3WithUrlHttpClientIntegrationTest {
+
+    /**
+     * The name of the bucket created, used, and deleted by these tests.
+     */
+    private static String BUCKET_NAME = "java-sdk-integ-" + System.currentTimeMillis();
+
+    private static String KEY = "key";
+
+    private static Region REGION = Region.US_WEST_2;
+
+    private static S3Client s3;
+
+    /**
+     * Creates all the test resources for the tests.
+     */
+    @BeforeClass
+    public static void createResources() throws Exception {
+        s3 = S3Client.builder()
+                     .region(REGION)
+                     .httpClient(UrlConnectionHttpClient.builder().build())
+                     .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
+                     .build();
+
+        createBucket(BUCKET_NAME, REGION);
+    }
+
+    /**
+     * Releases all resources created in this test.
+     */
+    @AfterClass
+    public static void tearDown() {
+        deleteObject(BUCKET_NAME, KEY);
+        deleteBucket(BUCKET_NAME);
+    }
+
+    @Test
+    public void verifyPutObject() {
+        Assertions.assertThat(objectCount(BUCKET_NAME)).isEqualTo(0);
+
+        // Put Object
+        s3.putObject(PutObjectRequest.builder().bucket(BUCKET_NAME).key(KEY).build(),
+                     RequestBody.fromString("foobar"));
+
+
+        Assertions.assertThat(objectCount(BUCKET_NAME)).isEqualTo(1);
+    }
+
+
+    private static void createBucket(String bucket, Region region) {
+        s3.createBucket(CreateBucketRequest
+                            .builder()
+                            .bucket(bucket)
+                            .createBucketConfiguration(
+                                CreateBucketConfiguration.builder()
+                                                         .locationConstraint(region.id())
+                                                         .build())
+                            .build());
+    }
+
+    private static void deleteObject(String bucket, String key) {
+        DeleteObjectRequest deleteObjectRequest = DeleteObjectRequest.builder().bucket(bucket).key(key).build();
+        s3.deleteObject(deleteObjectRequest);
+    }
+
+    private static void deleteBucket(String bucket) {
+        DeleteBucketRequest deleteBucketRequest = DeleteBucketRequest.builder().bucket(bucket).build();
+        s3.deleteBucket(deleteBucketRequest);
+    }
+
+    private int objectCount(String bucket) {
+        ListObjectsV2Request listReq = ListObjectsV2Request.builder()
+                                                           .bucket(bucket)
+                                                           .build();
+
+        return s3.listObjectsV2(listReq).keyCount();
+    }
+}

services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumCalculatingInputStream.java

@@ -78,7 +78,7 @@ public int read(byte[] buf, int off, int len) throws IOException {
             throw new NullPointerException();
         }
 
-        int read = 0;
+        int read = -1;
 
         if (!endOfStream) {
             read = inputStream.read(buf, off, len);
@@ -89,7 +89,6 @@ public int read(byte[] buf, int off, int len) throws IOException {
 
             if (read == -1) {
                 endOfStream = true;
-                read = 0;
             }
         }