Merge branch 'fix/strict-permissions' of github.com:saalfeldlab/n5-aw…

…s-s3 into fix/strict-permissions

src/main/java/org/janelia/saalfeldlab/n5/s3/AmazonS3KeyValueAccess.java

@@ -141,11 +141,10 @@ public AmazonS3KeyValueAccess(final AmazonS3 s3, final URI containerURI, final b
 	}
 
 	private boolean bucketExists() {
-		if (bucketCheckedAndExists != null)
-			return bucketCheckedAndExists;
 
-		bucketCheckedAndExists = s3.doesBucketExistV2(bucketName);
-		return bucketCheckedAndExists;
+		return bucketCheckedAndExists = bucketCheckedAndExists != null
+				? bucketCheckedAndExists
+				: s3.doesBucketExistV2(bucketName);
 	}
 
 	private void createBucket() {
@@ -156,7 +155,6 @@ private void createBucket() {
 		if (bucketExists())
 			return;
 
-
 		Region region;
 		try {
 			region = s3.getRegion();
@@ -172,6 +170,21 @@ private void createBucket() {
 
 	}
 
+	private void deleteBucket() {
+		if (!createBucket)
+			throw new N5Exception("Delete Bucket Not Allowed");
+
+		if (!bucketExists())
+			return;
+
+		try {
+			s3.deleteBucket(bucketName);
+			bucketCheckedAndExists = false;
+		} catch (Exception e) {
+			throw new N5Exception("Could not delete bucket " + bucketName, e);
+		}
+	}
+
 	@Override
 	public String[] components(final String path) {
 
@@ -516,7 +529,7 @@ public void delete(final String normalPath) {
 				}
 			}
 
-			s3.deleteBucket(bucketName);
+			deleteBucket();
 			return;
 		}