Merge pull request Azure#48 from jofriedm-msft/dev

Fixed transactional MD5 check
g2vinay · May 3, 2017 · 9585f95 · 9585f95
2 parents 05ac043 + bc57978
commit 9585f95
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/BreakingChanges.txt b/BreakingChanges.txt
@@ -6,7 +6,7 @@ FILE
  * In CloudFileShareProperties, setShareQuota() no longer asserts in bounds. This check has been moved to create() and uploadProperties() in CloudFileShare.
 
 BLOB/FILE
- * Fixed a bug which allowed setting content MD5 to true when calling openWriteExisting() on a page blob or file.
+ * Fixed a bug which prevented setting content MD5 to true when calling openWriteExisting() on a page blob or file.
 
 Changes in 5.0.0
 

diff --git a/microsoft-azure-storage/src/com/microsoft/azure/storage/blob/CloudBlob.java b/microsoft-azure-storage/src/com/microsoft/azure/storage/blob/CloudBlob.java
@@ -1360,6 +1360,13 @@ public Integer preProcessResponse(CloudBlob blob, CloudBlobClient client, Operat
                     // Need to store the Content MD5 in case we fail part way through.
                     // We would still need to verify the entire range.
                     String contentMD5 = this.getConnection().getHeaderField(Constants.HeaderConstants.CONTENT_MD5);
+
+                    if (!options.getDisableContentMD5Validation() && options.getUseTransactionalContentMD5()
+                            && Utility.isNullOrEmpty(contentMD5)) {
+                        throw new StorageException(StorageErrorCodeStrings.MISSING_MD5_HEADER, SR.MISSING_MD5,
+                                Constants.HeaderConstants.HTTP_UNUSED_306, null, null);
+                    }
+
                     this.setContentMD5(contentMD5);
                     this.setLockedETag(blob.properties.getEtag());
                     this.setArePropertiesPopulated(true);