Merge branch '6.1.x'

Author: snicoll

spring-web/src/main/java/org/springframework/web/client/DefaultRestClient.java

@@ -204,7 +204,7 @@ private <T> T readWithMessageConverters(ClientHttpResponse clientResponse, Runna
 
 		MediaType contentType = getContentType(clientResponse);
 
-		try (clientResponse) {
+		try {
 			callback.run();
 
 			IntrospectingClientHttpResponse responseWrapper = new IntrospectingClientHttpResponse(clientResponse);
@@ -257,17 +257,18 @@ else if (messageConverter.canRead(bodyClass, contentType)) {
 					ResolvableType.forType(bodyType) + "] and content type [" + contentType + "]", cause);
 			if (observation != null) {
 				observation.error(restClientException);
-				observation.stop();
 			}
 			throw restClientException;
 		}
 		catch (RestClientException restClientException) {
 			if (observation != null) {
 				observation.error(restClientException);
-				observation.stop();
 			}
 			throw restClientException;
 		}
+		finally {
+			clientResponse.close();
+		}
 	}
 
 	private static MediaType getContentType(ClientHttpResponse clientResponse) {