Repository: logging-log4j2 Updated Branches: refs/heads/LOG4J2-1136 b3596bf92 -> 610542246
[LOG4J2-1136] Add support for JSR 223 scripts in filters and the PatternSelector: Use charset for files too. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/61054224 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/61054224 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/61054224 Branch: refs/heads/LOG4J2-1136 Commit: 61054224612865b7ba4f867392f9cd4b9a99705d Parents: b3596bf Author: ggregory <[email protected]> Authored: Tue Sep 29 01:04:50 2015 -0700 Committer: ggregory <[email protected]> Committed: Tue Sep 29 01:04:50 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/core/script/ScriptFile.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/61054224/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java index 85497f6..6ff6e27 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java @@ -1,7 +1,7 @@ package org.apache.logging.log4j.core.script; import java.io.File; -import java.io.FileReader; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; @@ -50,8 +50,8 @@ public class ScriptFile extends AbstractScript { final URI uri = NetUtils.toURI(filePathOrUri); final File file = FileUtils.fileFromUri(uri); String scriptText; - try (final Reader reader = file != null ? new FileReader(file) - : new InputStreamReader(uri.toURL().openStream(), actualCharset)) { + try (final Reader reader = new InputStreamReader( + file != null ? new FileInputStream(file) : uri.toURL().openStream(), actualCharset)) { scriptText = IOUtils.toString(reader); } catch (IOException e) { logger.error("{}: name={}, language={}, path={}, actualCharset={}", e.getClass().getSimpleName(), name,
