Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Raise RestClientException for unknown status codes

Browse Source 
HttpStatus cannot be created with an unknown status code. If a server
returns a status code that's not in the HttpStatus enum values, an
IllegalArgumentException is raised. Rather than allowing it to
propagate as such, this change ensures the actual exception raised is
a RestClientException.

Issue: SPR-9406
This commit is contained in:
Rossen Stoyanchev
2012-06-12 14:54:16 -04:00
parent 0e3a1d8176
commit ab4952a959
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
View File

@@ -45,7 +45,18 @@ public class DefaultResponseErrorHandler implements ResponseErrorHandler {
* Delegates to {@link #hasError(HttpStatus)} with the response status code.
*/
public boolean hasError(ClientHttpResponse response) throws IOException {
return hasError(response.getStatusCode());
return hasError(getStatusCode(response));
}
private HttpStatus getStatusCode(ClientHttpResponse response) throws IOException {
HttpStatus statusCode;
try {
statusCode = response.getStatusCode();
}
catch (IllegalArgumentException ex) {
throw new RestClientException("Unknown status code [" + response.getRawStatusCode() + "]");
}
return statusCode;
}
/**
@@ -69,7 +80,7 @@ public class DefaultResponseErrorHandler implements ResponseErrorHandler {
* and a {@link RestClientException} in other cases.
*/
public void handleError(ClientHttpResponse response) throws IOException {
HttpStatus statusCode = response.getStatusCode();
HttpStatus statusCode = getStatusCode(response);
HttpHeaders headers = response.getHeaders();
MediaType contentType = headers.getContentType();
Charset charset = contentType != null ? contentType.getCharSet() : null;