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/20 08:37:33 UTC
tapestry-5 git commit: stay compatible with Java 6
Repository: tapestry-5
Updated Branches:
refs/heads/5.4.x 48586f306 -> 24718a7df
stay compatible with Java 6
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/24718a7d
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/24718a7d
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/24718a7d
Branch: refs/heads/5.4.x
Commit: 24718a7df18c04455df2b5647ee16410fd363936
Parents: 48586f3
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Mon Mar 20 09:37:18 2017 +0100
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Mon Mar 20 09:37:18 2017 +0100
----------------------------------------------------------------------
.../tapestry5/internal/webresources/RhinoExecutorPool.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/24718a7d/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 80efaee..59e9277 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,8 +28,6 @@ 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;
@@ -144,7 +142,7 @@ public class RhinoExecutorPool
try
{
in = script.openStream();
- r = new InputStreamReader(in, StandardCharsets.UTF_8);
+ r = new InputStreamReader(in, "UTF-8");
context.evaluateReader(scope, r, script.toString(), 1, null);
} catch (IOException ex)