Fix TOCTOU issue when getting blob during removal
Fixes gaul/s3proxy#318.
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 2eba12b..aa5b73c 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
@@ -632,14 +632,14 @@
logger.debug("Container %s does not exist", containerName);
throw cnfe(containerName);
}
+
// If the blob doesn't exist, a null object is returned
- if (!storageStrategy.blobExists(containerName, key)) {
+ Blob blob = loadBlob(containerName, key);
+ if (blob == null) {
logger.debug("Item %s does not exist in container %s", key, containerName);
return null;
}
- Blob blob = loadBlob(containerName, key);
-
if (options != null) {
String eTag = blob.getMetadata().getETag();
if (eTag != null) {
