From c6725916c5ac826db0dc63a2de0855429953f392 Mon Sep 17 00:00:00 2001 From: "Thomas E. Enebo" Date: Thu, 1 Aug 2013 13:45:42 -0500 Subject: [PATCH] JRUBY-7190: Incorrect encoding on result string read from File introduced in JRuby 1.7.4 --- core/src/main/java/org/jruby/RubyFile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/jruby/RubyFile.java b/core/src/main/java/org/jruby/RubyFile.java index b78f04d5192..d9ef4f2d0bb 100644 --- a/core/src/main/java/org/jruby/RubyFile.java +++ b/core/src/main/java/org/jruby/RubyFile.java @@ -1232,7 +1232,7 @@ protected void sysopenInternal(String path, ModeFlags modes, int perm) { IRubyObject theInternal = internalEncoding == null ? runtime.getNil() : runtime.getEncodingService().getEncoding(internalEncoding); - setEncoding(runtime.getCurrentContext(), theInternal, theBom, null); + setEncoding(runtime.getCurrentContext(), theBom, theInternal, null); } } }