Repository: jclouds Updated Branches: refs/heads/master 25f4807df -> 4ce357ba6
Consistently quote ETags in comparisons Addresses integration test regression in 25f4807df868cff9a9da599009adc0091f7bb52b. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/4ce357ba Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/4ce357ba Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/4ce357ba Branch: refs/heads/master Commit: 4ce357ba693dfd0efd1b0eeff9fb55f2ba126be1 Parents: 25f4807 Author: Andrew Gaul <[email protected]> Authored: Thu Nov 19 19:00:34 2015 -0800 Committer: Andrew Gaul <[email protected]> Committed: Thu Nov 19 19:00:34 2015 -0800 ---------------------------------------------------------------------- .../main/java/org/jclouds/blobstore/config/LocalBlobStore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/4ce357ba/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java ---------------------------------------------------------------------- diff --git a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java index 96edd2e..6be3eba 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java @@ -630,11 +630,11 @@ public final class LocalBlobStore implements BlobStore { if (options != null) { if (options.getIfMatch() != null) { - if (!maybeQuoteETag(blob.getMetadata().getETag()).equals(options.getIfMatch())) + if (!maybeQuoteETag(blob.getMetadata().getETag()).equals(maybeQuoteETag(options.getIfMatch()))) throw returnResponseException(412); } if (options.getIfNoneMatch() != null) { - if (maybeQuoteETag(blob.getMetadata().getETag()).equals(options.getIfNoneMatch())) + if (maybeQuoteETag(blob.getMetadata().getETag()).equals(maybeQuoteETag(options.getIfNoneMatch()))) throw returnResponseException(304); } if (options.getIfModifiedSince() != null) {
