From d81ee81a869ceeeda3b88c350c2af141332a2187 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Thu, 15 Jan 2015 18:31:31 -0800 Subject: [PATCH] Handle null from HttpResponseException.getResponse --- src/main/java/org/gaul/s3proxy/S3ProxyHandler.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java index 9376704..356c45d 100644 --- a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java +++ b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java @@ -79,6 +79,7 @@ import org.jclouds.blobstore.options.GetOptions; import org.jclouds.blobstore.options.ListContainerOptions; import org.jclouds.blobstore.options.PutOptions; import org.jclouds.domain.Location; +import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponseException; import org.jclouds.io.ContentMetadata; import org.jclouds.rest.AuthorizationException; @@ -1000,7 +1001,11 @@ final class S3ProxyHandler extends AbstractHandler { sendSimpleErrorResponse(response, S3ErrorCode.NO_SUCH_BUCKET); return; } catch (HttpResponseException hre) { - int status = hre.getResponse().getStatusCode(); + HttpResponse hr = hre.getResponse(); + if (hr == null) { + return; + } + int status = hr.getStatusCode(); switch (status) { case HttpServletResponse.SC_BAD_REQUEST: case 422: // Swift returns 422 Unprocessable Entity