Close InputStream in ResourceHttpMessageConverter

Spring 3.2.2 introduced a change to avoid closing the response stream
in HttpMessageConverters (SPR-10095). However, the InputStream of
resources being written, for example as part of a multi-part request
should be closed. This change ensures that.

Issue: SPR-10460

spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java

@@ -85,7 +85,17 @@ protected Long getContentLength(Resource resource, MediaType contentType) throws
 	protected void writeInternal(Resource resource, HttpOutputMessage outputMessage)
 			throws IOException, HttpMessageNotWritableException {
 
-		StreamUtils.copy(resource.getInputStream(), outputMessage.getBody());
+		InputStream in = resource.getInputStream();
+		try {
+			StreamUtils.copy(in, outputMessage.getBody());
+		}
+		finally {
+			try {
+				in.close();
+			}
+			catch (IOException ex) {
+			}
+		}
 		outputMessage.getBody().flush();
 	}