File constants have ASCII encoding on MRI (not UTF-8 as JRuby had)

jruby · Jun 5, 2017 · 67debf2 · 67debf2
1 parent fce4eaa
commit 67debf2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/RubyFile.java b/core/src/main/java/org/jruby/RubyFile.java
@@ -109,21 +109,21 @@ public static RubyClass createFileClass(Ruby runtime) {
         fileClass.kindOf = new RubyModule.JavaClassKindOf(RubyFile.class);
 
         // file separator constants
-        RubyString separator = runtime.newString("/");
+        RubyString separator = RubyString.newString(runtime, new ByteList(new byte[] { '/' }, false));
         separator.freeze(context);
         fileClass.defineConstant("SEPARATOR", separator);
         fileClass.defineConstant("Separator", separator);
 
         if (File.separatorChar == '\\') {
-            RubyString altSeparator = runtime.newString("\\");
+            RubyString altSeparator = RubyString.newString(runtime, new ByteList(new byte[] { '\\' }, false));
             altSeparator.freeze(context);
             fileClass.defineConstant("ALT_SEPARATOR", altSeparator);
         } else {
-            fileClass.defineConstant("ALT_SEPARATOR", runtime.getNil());
+            fileClass.defineConstant("ALT_SEPARATOR", context.nil);
         }
 
         // path separator
-        RubyString pathSeparator = runtime.newString(File.pathSeparator);
+        RubyString pathSeparator = RubyString.newString(runtime, new ByteList(new byte[] { (byte) File.pathSeparatorChar }, false));
         pathSeparator.freeze(context);
         fileClass.defineConstant("PATH_SEPARATOR", pathSeparator);