Repository: jclouds-labs-google Updated Branches: refs/heads/2.0.x b827b8047 -> 69866189d
JCLOUDS-1327: Do not try GCS MPU if length is zero References JCLOUDS-912. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/69866189 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/69866189 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/69866189 Branch: refs/heads/2.0.x Commit: 69866189d73449aeb5b698e30959b5fcfaeab0cc Parents: b827b80 Author: Andrew Gaul <g...@apache.org> Authored: Sun Aug 6 13:53:23 2017 -0700 Committer: Andrew Gaul <g...@apache.org> Committed: Sun Aug 6 13:53:23 2017 -0700 ---------------------------------------------------------------------- .../blobstore/GoogleCloudStorageBlobStore.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/69866189/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java index c86dcc8..b58f25c 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java @@ -215,13 +215,13 @@ public final class GoogleCloudStorageBlobStore extends BaseBlobStore { @Override public String putBlob(String container, Blob blob, PutOptions options) { - if (options.isMultipart() || !blob.getPayload().isRepeatable()) { + long length = checkNotNull(blob.getPayload().getContentMetadata().getContentLength()); + + if (length != 0 && (options.isMultipart() || !blob.getPayload().isRepeatable())) { // JCLOUDS-912 prevents using single-part uploads with InputStream payloads. // Work around this with multi-part upload which buffers parts in-memory. return putMultipartBlob(container, blob, options); } else { - checkNotNull(blob.getPayload().getContentMetadata().getContentLength()); - ObjectTemplate template = blobMetadataToObjectTemplate.apply(blob.getMetadata()); HashCode md5 = blob.getMetadata().getContentMetadata().getContentMD5AsHashCode();
