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

Fixing the build 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3084 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Arjen Poutsma 2010-03-11 16:54:47 +00:00
parent 8c55e20ea8
commit 7b2efa4fbf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.springframework.web/src/main/java/org/springframework/web/client/RestTemplate.java
View File

@ -522,12 +522,13 @@ public class RestTemplate extends HttpAccessor implements RestOperations {
public void doWithRequest(ClientHttpRequest httpRequest) throws IOException {
super.doWithRequest(httpRequest);
if (!requestEntity.hasBody()) {
HttpHeaders httpHeaders = httpRequest.getHeaders();
HttpHeaders requestHeaders = requestEntity.getHeaders();
if (!requestHeaders.isEmpty()) {
httpRequest.getHeaders().putAll(requestHeaders);
httpHeaders.putAll(requestHeaders);
}
if (httpRequest.getHeaders().getContentLength() == -1) {
httpRequest.getHeaders().setContentLength(0L);
if (httpHeaders.getContentLength() == -1) {
httpHeaders.setContentLength(0L);
}
}
else {