Repository: tapestry-5
Updated Branches:
  refs/heads/5.4.x 45eaae528 -> 0522e587b


always specify a charset when reading an InputStream


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/0522e587
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/0522e587
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/0522e587

Branch: refs/heads/5.4.x
Commit: 0522e587bb6337a7072ef84d4c59e10b345f4e64
Parents: 45eaae5
Author: Jochen Kemnade <jochen.kemn...@eddyson.de>
Authored: Thu Mar 9 09:24:45 2017 +0100
Committer: Jochen Kemnade <jochen.kemn...@eddyson.de>
Committed: Thu Mar 9 09:26:57 2017 +0100

----------------------------------------------------------------------
 .../apache/tapestry5/internal/webresources/RhinoExecutorPool.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0522e587/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java
----------------------------------------------------------------------
diff --git 
a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java
 
b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java
index 3a83599..80efaee 100644
--- 
a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java
+++ 
b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java
@@ -28,6 +28,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -143,7 +144,7 @@ public class RhinoExecutorPool
                         try
                         {
                             in = script.openStream();
-                            r = new InputStreamReader(in);
+                            r = new InputStreamReader(in, 
StandardCharsets.UTF_8);
 
                             context.evaluateReader(scope, r, 
script.toString(), 1, null);
                         } catch (IOException ex)

Reply via email to