Skip to content
Browse files

Back off to pre-bytelist library behavior by not including encoding f…

…or Marshal.dump
  • Loading branch information...
1 parent cb78dad commit 55f8fb2ebccbeafa988976d9c137d2d6acdc88e4 @enebo enebo committed with yokolet Jan 7, 2011
Showing with 1 addition and 2 deletions.
  1. +1 −2 src/org/jruby/RubyMarshal.java
View
3 src/org/jruby/RubyMarshal.java
@@ -99,8 +99,7 @@ public static IRubyObject dump(IRubyObject recv, IRubyObject[] args, Block unuse
ByteArrayOutputStream stringOutput = new ByteArrayOutputStream();
boolean taint = dumpToStream(runtime, objectToDump, stringOutput, depthLimit);
- // FIXME: This should probably be external but since we don't have encoding translation support....
- RubyString result = RubyString.newString(runtime, new ByteList(stringOutput.toByteArray(), runtime.getDefaultExternalEncoding(), false));
+ RubyString result = RubyString.newString(runtime, new ByteList(stringOutput.toByteArray()));
if (taint) result.setTaint(true);

0 comments on commit 55f8fb2

Please sign in to comment.
Something went wrong with that request. Please try again.