[Truffle] - String#capitalize(!) should preserve the string encoding

jruby · Dec 22, 2014 · 86cab8d · 86cab8d
1 parent c1f0e4c
commit 86cab8d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
@@ -1217,7 +1217,10 @@ public RubyString capitalizeBang(RubyString string) {
             } else {
                 String head = javaString.substring(0, 1).toUpperCase();
                 String tail = javaString.substring(1, javaString.length()).toLowerCase();
-                string.set(ByteList.create((head + tail)));
+                ByteList byteListString = ByteList.create(head + tail);
+                byteListString.setEncoding(string.getBytes().getEncoding());
+
+                string.set(byteListString);
                 return string;
             }
         }
@@ -1243,7 +1246,10 @@ public RubyString capitalize(RubyString string) {
             } else {
                 String head = javaString.substring(0, 1).toUpperCase();
                 String tail = javaString.substring(1, javaString.length()).toLowerCase();
-                return string.getContext().makeString(head + tail);
+                ByteList byteListString = ByteList.create(head + tail);
+                byteListString.setEncoding(string.getBytes().getEncoding());
+
+                return string.getContext().makeString(byteListString);
             }
         }