From 0224cbc3de497bfde0ae705429f6feb4234fca6e Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Thu, 4 Feb 2010 10:04:48 +0000 Subject: [PATCH] SPR-6794 + used UTF-8 as the implicit encoding for reading scripts --- .../support/ResourceScriptSource.java | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java b/org.springframework.context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java index b21cd8bb108..6555e2d93e4 100644 --- a/org.springframework.context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java +++ b/org.springframework.context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java @@ -79,20 +79,9 @@ public class ResourceScriptSource implements ScriptSource { synchronized (this.lastModifiedMonitor) { this.lastModified = retrieveLastModifiedTime(); } - Reader reader = null; - try { - // Try to get a FileReader first: generally more reliable. - reader = new FileReader(getResource().getFile()); - } - catch (IOException ex) { - if (logger.isDebugEnabled()) { - logger.debug("Could not open FileReader for " + this.resource + - " - falling back to InputStreamReader", ex); - } - } - if (reader == null) { - reader = new InputStreamReader(this.resource.getInputStream()); - } + + Reader reader = new InputStreamReader(this.resource.getInputStream(), "UTF-8"); + return FileCopyUtils.copyToString(reader); } @@ -128,5 +117,4 @@ public class ResourceScriptSource implements ScriptSource { public String toString() { return this.resource.toString(); } - -} +} \ No newline at end of file