From 4be25988d1da58f68a61d6d9a4dcd7cb06578f9e Mon Sep 17 00:00:00 2001 From: tlrx Date: Fri, 7 Nov 2014 09:52:38 +0100 Subject: [PATCH] Update S3BlobContainer because BlobContainer changed See elasticsearch/elasticsearch#8366 --- .../cloud/aws/blobstore/S3BlobContainer.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/elasticsearch/cloud/aws/blobstore/S3BlobContainer.java b/src/main/java/org/elasticsearch/cloud/aws/blobstore/S3BlobContainer.java index d5a10079f6d..d5e231b70ba 100644 --- a/src/main/java/org/elasticsearch/cloud/aws/blobstore/S3BlobContainer.java +++ b/src/main/java/org/elasticsearch/cloud/aws/blobstore/S3BlobContainer.java @@ -19,6 +19,7 @@ package org.elasticsearch.cloud.aws.blobstore; +import com.amazonaws.AmazonClientException; import com.amazonaws.services.s3.model.AmazonS3Exception; import com.amazonaws.services.s3.model.ObjectListing; import com.amazonaws.services.s3.model.S3Object; @@ -68,9 +69,12 @@ public class S3BlobContainer extends AbstractBlobContainer { } @Override - public boolean deleteBlob(String blobName) throws IOException { - blobStore.client().deleteObject(blobStore.bucket(), buildKey(blobName)); - return true; + public void deleteBlob(String blobName) throws IOException { + try { + blobStore.client().deleteObject(blobStore.bucket(), buildKey(blobName)); + } catch (AmazonClientException e) { + throw new IOException("Exception when deleting blob [" + blobName + "]", e); + } } @Override