root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

SPR-8883 - RestTemplate.headForHeaders throws "IllegalArgumentException: No InputStream specified" on server resource which status code are 4xx

This commit is contained in:
Arjen Poutsma 2011-12-08 19:17:48 +00:00
parent b94040f329
commit 3beef9a92e
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.springframework.web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
View File

@ -17,6 +17,7 @@
package org.springframework.web.client; package org.springframework.web.client;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@ -82,11 +83,15 @@ public class DefaultResponseErrorHandler implements ResponseErrorHandler {
private byte[] getResponseBody(ClientHttpResponse response) { private byte[] getResponseBody(ClientHttpResponse response) {
try { try {
return FileCopyUtils.copyToByteArray(response.getBody()); InputStream responseBody = response.getBody();
if (responseBody != null) {
return FileCopyUtils.copyToByteArray(responseBody);
}
} }
catch (IOException ex) { catch (IOException ex) {
return new byte[0]; // ignore
} }
return new byte[0];
} }
} }

26
org.springframework.web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerTests.java
View File

@ -19,16 +19,17 @@ package org.springframework.web.client;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.client.ClientHttpResponse; import org.springframework.http.client.ClientHttpResponse;
import org.junit.Before;
import org.junit.Test;
import static org.easymock.EasyMock.*; import static org.easymock.EasyMock.*;
import static org.junit.Assert.*; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/** @author Arjen Poutsma */ /** @author Arjen Poutsma */
public class DefaultResponseErrorHandlerTests { public class DefaultResponseErrorHandlerTests {
@ -96,4 +97,21 @@ public class DefaultResponseErrorHandlerTests {
verify(response); verify(response);
} }
@Test(expected = HttpClientErrorException.class)
public void handleErrorNullResponse() throws Exception {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.TEXT_PLAIN);
expect(response.getStatusCode()).andReturn(HttpStatus.NOT_FOUND);
expect(response.getStatusText()).andReturn("Not Found");
expect(response.getHeaders()).andReturn(headers);
expect(response.getBody()).andReturn(null);
replay(response);
handler.handleError(response);
verify(response);
}
} }