From f93bfa8f8440e028cbd356569073fea6057bccfe Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Wed, 2 Apr 2014 20:54:12 +0200
Subject: [PATCH] ResourceHttpRequestHandler explicitly closes a Resource's
 InputStream

Issue: SPR-11644
(cherry picked from commit 3a96f16)
---
 .../servlet/resource/ResourceHttpRequestHandler.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
index 088d238052a..cdb0453ed85 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
@@ -249,7 +249,17 @@ public class ResourceHttpRequestHandler extends WebContentGenerator implements H
 	 * @throws IOException in case of errors while writing the content
 	 */
 	protected void writeContent(HttpServletResponse response, Resource resource) throws IOException {
-		StreamUtils.copy(resource.getInputStream(), response.getOutputStream());
+		InputStream in = resource.getInputStream();
+		try {
+			StreamUtils.copy(in, response.getOutputStream());
+		}
+		finally {
+			try {
+				in.close();
+			}
+			catch (IOException ex) {
+			}
+		}
 	}