Repository: jclouds-labs-google Updated Branches: refs/heads/2.0.x 43ae590ab -> 3a0c75c76
Use a random UUID for fake upload ID This matches the Azure provider. 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/3a0c75c7 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/3a0c75c7 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/3a0c75c7 Branch: refs/heads/2.0.x Commit: 3a0c75c76db823ba2425a0b59bbc170235d2cd4b Parents: 43ae590 Author: Andrew Gaul <[email protected]> Authored: Thu Apr 13 12:57:09 2017 -0700 Committer: Andrew Gaul <[email protected]> Committed: Thu Apr 13 13:02:40 2017 -0700 ---------------------------------------------------------------------- .../blobstore/GoogleCloudStorageBlobStore.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/3a0c75c7/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 25d27f2..c86dcc8 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 @@ -22,6 +22,7 @@ import static org.jclouds.googlecloudstorage.domain.DomainResourceReferences.Obj import java.util.List; import java.util.Set; +import java.util.UUID; import javax.inject.Inject; @@ -368,7 +369,7 @@ public final class GoogleCloudStorageBlobStore extends BaseBlobStore { @Override public MultipartUpload initiateMultipartUpload(String container, BlobMetadata blobMetadata, PutOptions options) { - String uploadId = blobMetadata.getName(); + String uploadId = UUID.randomUUID().toString(); return MultipartUpload.create(container, blobMetadata.getName(), uploadId, blobMetadata, options); } @@ -430,7 +431,7 @@ public final class GoogleCloudStorageBlobStore extends BaseBlobStore { public List<MultipartPart> listMultipartUpload(MultipartUpload mpu) { ImmutableList.Builder<MultipartPart> parts = ImmutableList.builder(); PageSet<? extends StorageMetadata> pageSet = list(mpu.containerName(), - new ListContainerOptions().prefix(mpu.blobName() + "_")); + new ListContainerOptions().prefix(mpu.id() + "_")); // TODO: pagination for (StorageMetadata sm : pageSet) { int lastUnderscore = sm.getName().lastIndexOf('_');
