Fixed a bug related to uploadFromMultiStream

Author: Josh Friedman

ChangeLog.txt

@@ -1,3 +1,6 @@
+2017.06.21 Version 5.3.1
+ * Fixed a bug in specific upload case for block blobs. This only affects uploads greater than the max put blob threshold, that have increased the streamWriteSizeInBytes beyond the 4 MB and storeBlobContentMD5 has been disabled.
+
 2017.06.13 Version 5.3.0
  * Fixed a bug where the transactional MD5 check would fail when downloading a range of blob or file and the recovery action is performed on a subsection of the range.
  * Fixed leaking connections for table requests.

microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/CloudBlockBlobTests.java

@@ -1057,8 +1057,9 @@ public void testLargeBlobUploadFromStreamAccessConditionTest() throws URISyntaxE
             srcStream = BlobTestHelper.getRandomDataStream(length);
             blockBlobRef.upload(srcStream, length, accessCondition, options, null);
         }
-        catch (StorageException ex)
+        catch (IOException e)
         {
+            StorageException ex = (StorageException)e.getCause();
             assertEquals(412, ex.getHttpStatusCode());
             assertEquals(StorageErrorCodeStrings.CONDITION_NOT_MET, ex.getErrorCode());
         }

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/CloudBlockBlob.java

@@ -733,6 +733,11 @@ public byte[] getByteArray() {
                                    || options.getStoreBlobContentMD5()
                                    || descriptor.getLength() == -1;
 
+            // there are two known issues with the uploadFromMultiStream logic
+            // 1. The same block ids are being used for each batch of uploads.
+            // 2. When using a bufferedInputStream and the size of the stream being uploaded exceeds Integer.MAX_VALUE,
+            //    a NegativeArraySizeException is thrown when attempting to skip past the 1 GB mark.
+            useOpenWrite = true;
             if (useOpenWrite) {
                 final BlobOutputStream writeStream = this.openOutputStream(accessCondition, options, opContext);
                 try {