Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Close properly the InputStream in ScriptTemplateView#getTemplate()

Browse Source 
Issue: SPR-13445
This commit is contained in:
Sebastien Deleuze
2015-09-08 17:21:44 +02:00
parent f2c9838e95
commit ff02ad47e0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateView.java
View File

@@ -40,7 +40,7 @@ import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader; import org.springframework.core.io.ResourceLoader;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.StreamUtils; import org.springframework.util.FileCopyUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.servlet.view.AbstractUrlBasedView; import org.springframework.web.servlet.view.AbstractUrlBasedView;
@@ -341,7 +341,8 @@ public class ScriptTemplateView extends AbstractUrlBasedView {
protected String getTemplate(String path) throws IOException { protected String getTemplate(String path) throws IOException {
Resource resource = this.resourceLoader.getResource(path); Resource resource = this.resourceLoader.getResource(path);
return StreamUtils.copyToString(resource.getInputStream(), this.charset); InputStreamReader reader = new InputStreamReader(resource.getInputStream(), this.charset);
return FileCopyUtils.copyToString(reader);
} }
} }