SPR-6794

+ used UTF-8 as the implicit encoding for reading scripts

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2913 50f2f4bb-b051-0410-bef5-90022cba6387

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();
 	}
-
-}
+}