Repository: jclouds Updated Branches: refs/heads/master 855ac7776 -> c468c60d5
Utilizing MD5 hash present in payload metadata, instead of generating it again from payload Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/c468c60d Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/c468c60d Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/c468c60d Branch: refs/heads/master Commit: c468c60d510e7a741b99e010894b0366ae8a0280 Parents: 855ac77 Author: khopade <[email protected]> Authored: Fri Nov 10 13:57:59 2017 +0530 Committer: Ignasi Barrera <[email protected]> Committed: Fri Nov 10 10:04:06 2017 +0100 ---------------------------------------------------------------------- .../http/apachehc/ApacheHCHttpCommandExecutorService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/c468c60d/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCHttpCommandExecutorService.java ---------------------------------------------------------------------- diff --git a/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCHttpCommandExecutorService.java b/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCHttpCommandExecutorService.java index 3ef7af9..75144f6 100644 --- a/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCHttpCommandExecutorService.java +++ b/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCHttpCommandExecutorService.java @@ -16,7 +16,6 @@ */ package org.jclouds.http.apachehc; -import static com.google.common.hash.Hashing.md5; import static com.google.common.io.BaseEncoding.base64; import static org.jclouds.Constants.PROPERTY_IDEMPOTENT_METHODS; import static org.jclouds.Constants.PROPERTY_USER_AGENT; @@ -42,7 +41,6 @@ import org.jclouds.http.handlers.DelegatingErrorHandler; import org.jclouds.http.handlers.DelegatingRetryHandler; import org.jclouds.http.internal.BaseHttpCommandExecutorService; import org.jclouds.http.internal.HttpWire; -import org.jclouds.io.ByteStreams2; import org.jclouds.io.ContentMetadataCodec; import org.jclouds.io.Payload; import org.jclouds.io.Payloads; @@ -74,7 +72,7 @@ public class ApacheHCHttpCommandExecutorService extends BaseHttpCommandExecutorS protected HttpUriRequest convert(HttpRequest request) throws IOException { HttpUriRequest returnVal = apacheHCUtils.convertToApacheRequest(request); if (request.getPayload() != null && request.getPayload().getContentMetadata().getContentMD5() != null) { - String md5 = base64().encode(ByteStreams2.hashAndClose(request.getPayload().openStream(), md5()).asBytes()); + String md5 = base64().encode(request.getPayload().getContentMetadata().getContentMD5AsHashCode().asBytes()); returnVal.addHeader("Content-MD5", md5); }
