Repository: jclouds Updated Branches: refs/heads/master 41bdd9c5a -> cd50ad905
Avoid NPE in BaseBlobStore.copyBlob Resolves copyBlob failures in Atmos. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/cd50ad90 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/cd50ad90 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/cd50ad90 Branch: refs/heads/master Commit: cd50ad905dc2250eff6b0cfa2f4fb0ba7f723b93 Parents: 41bdd9c Author: Andrew Gaul <[email protected]> Authored: Thu May 12 12:47:53 2016 -0700 Committer: Andrew Gaul <[email protected]> Committed: Thu May 12 12:48:07 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/jclouds/blobstore/internal/BaseBlobStore.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/cd50ad90/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java ---------------------------------------------------------------------- diff --git a/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java index c6d21ff..ad92734 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java @@ -263,8 +263,9 @@ public abstract class BaseBlobStore implements BlobStore { throw new KeyNotFoundException(fromContainer, fromName, "while copying"); } - String eTag = maybeQuoteETag(blob.getMetadata().getETag()); + String eTag = blob.getMetadata().getETag(); if (eTag != null) { + eTag = maybeQuoteETag(eTag); if (options.ifMatch() != null && !options.ifMatch().equals(eTag)) { throw returnResponseException(412); }
