From 4ce357ba693dfd0efd1b0eeff9fb55f2ba126be1 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Thu, 19 Nov 2015 19:00:34 -0800 Subject: [PATCH] Consistently quote ETags in comparisons Addresses integration test regression in 25f4807df868cff9a9da599009adc0091f7bb52b. --- .../java/org/jclouds/blobstore/config/LocalBlobStore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 96edd2e6c5..6be3eba194 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) {