From 209f3e60e4a7c520383c41bbedd947e24d66da5a Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Fri, 13 Mar 2015 18:58:27 -0700
Subject: [PATCH] Narrow exception handling scope

---
 src/main/java/org/gaul/s3proxy/S3ProxyHandler.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
index d1d5b36..e12ec02 100644
--- a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
+++ b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
@@ -750,17 +750,18 @@ final class S3ProxyHandler extends AbstractHandler {
             }
         }
 
+        boolean created;
         try {
-            if (blobStore.createContainerInLocation(location, containerName,
-                    options)) {
-                return;
-            }
+            created = blobStore.createContainerInLocation(location,
+                    containerName, options);
+        } catch (AuthorizationException ae) {
+            throw new S3Exception(S3ErrorCode.BUCKET_ALREADY_EXISTS, ae);
+        }
+        if (!created) {
             S3ErrorCode errorCode = S3ErrorCode.BUCKET_ALREADY_OWNED_BY_YOU;
             sendSimpleErrorResponse(response,
                     errorCode, errorCode.getMessage(), "BucketName",
                     containerName);
-        } catch (AuthorizationException ae) {
-            throw new S3Exception(S3ErrorCode.BUCKET_ALREADY_EXISTS, ae);
         }
     }