You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2017/03/09 08:25:55 UTC
tapestry-5 git commit: always specify a charset when reading an
InputStream
Repository: tapestry-5
Updated Branches:
refs/heads/master d6d1bf134 -> beaa642b4
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/beaa642b
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/beaa642b
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/beaa642b
Branch: refs/heads/master
Commit: beaa642b4cc01d49f7823a7f3c8933c490e37680
Parents: d6d1bf1
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Thu Mar 9 09:24:45 2017 +0100
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Thu Mar 9 09:24:45 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/beaa642b/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)