Repository: jclouds Updated Branches: refs/heads/master c468c60d5 -> 8b94febfe
Throw consistent exception on invalid range read Previously S3, Swift, and local blobstores threw a generic IllegalArgumentException for this uncommon error. Instead consistently throw HttpResponseException. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/8b94febf Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/8b94febf Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/8b94febf Branch: refs/heads/master Commit: 8b94febfeb7b55664fc6fca58bbc7ef20255c71c Parents: c468c60 Author: Andrew Gaul <[email protected]> Authored: Fri Nov 10 21:37:25 2017 -0800 Committer: Andrew Gaul <[email protected]> Committed: Fri Nov 10 21:39:47 2017 -0800 ---------------------------------------------------------------------- .../cloudfiles/v1/handlers/CloudFilesErrorHandler.java | 3 --- .../org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java | 5 ----- .../main/java/org/jclouds/blobstore/config/LocalBlobStore.java | 4 ++-- 3 files changed, 2 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/8b94febf/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/handlers/CloudFilesErrorHandler.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/handlers/CloudFilesErrorHandler.java b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/handlers/CloudFilesErrorHandler.java index 99e0d88..875544d 100644 --- a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/handlers/CloudFilesErrorHandler.java +++ b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/handlers/CloudFilesErrorHandler.java @@ -77,9 +77,6 @@ public class CloudFilesErrorHandler implements HttpErrorHandler { case 413: exception = new InsufficientResourcesException(exception.getMessage(), exception); break; - case 416: - exception = new IllegalArgumentException(exception.getMessage(), exception); - break; } command.setException(exception); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/8b94febf/apis/sts/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java ---------------------------------------------------------------------- diff --git a/apis/sts/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java b/apis/sts/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java index 6160f86..c298fc7 100644 --- a/apis/sts/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java +++ b/apis/sts/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java @@ -133,11 +133,6 @@ public class ParseAWSErrorFromXmlContent implements HttpErrorHandler { exception = new IllegalStateException(message, exception); } break; - case 416: - if ("InvalidRange".equals(errorCode)) { - exception = new IllegalArgumentException(message, exception); - } - break; } return exception; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/8b94febf/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java ---------------------------------------------------------------------- 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 56a0691..6602360 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java @@ -704,11 +704,11 @@ public final class LocalBlobStore implements BlobStore { offset = Long.parseLong(firstLast[0]); last = Long.parseLong(firstLast[1]); } else { - throw new IllegalArgumentException("illegal range: " + s); + throw new HttpResponseException("illegal range: " + s, null, null); } if (offset >= blob.getPayload().getContentMetadata().getContentLength()) { - throw new IllegalArgumentException("illegal range: " + s); + throw new HttpResponseException("illegal range: " + s, null, null); } if (last + 1 > blob.getPayload().getContentMetadata().getContentLength()) { last = blob.getPayload().getContentMetadata().getContentLength() - 1;
