Merge pull request jruby#9339 from kares/io-enc-10

[fix] IO#reopen: copy encoding from source IO

Author: headius

core/src/main/java/org/jruby/RubyIO.java

@@ -533,6 +533,7 @@ protected RubyIO reopenIO(ThreadContext context, RubyIO nfile) {
         boolean locked2 = orig.lock(); // TODO: This WILL deadlock if two threads try to reopen the same IOs in opposite directions. Fix?
         try {
             fptr.setMode(orig.getMode() | (fptr.getMode() & (OpenFile.PREP | OpenFile.SYNC)));
+            fptr.encs = orig.encs;
             fptr.setProcess(orig.getProcess());
             fptr.setLineNumber(orig.getLineNumber());
             if (orig.getPath() != null) fptr.setPath(orig.getPath());

test/jruby/test_io.rb

@@ -153,6 +153,22 @@ def test_reopen
     assert_nothing_raised { file.reopen(@file) }
   end
 
+  def test_reopen_copies_encoding
+    ensure_files @file, @file2
+    f1 = File.open(@file)
+    @to_close << f1
+    f1.set_encoding("EUC-JP:UTF-8")
+
+    f2 = File.open(@file2)
+    @to_close << f2
+    f2.set_encoding("ISO-8859-1:US-ASCII")
+
+    f1.reopen(f2)
+
+    assert_equal Encoding::ISO_8859_1, f1.external_encoding
+    assert_equal Encoding::US_ASCII, f1.internal_encoding
+  end
+
   def test_file_read
     ensure_files @file
     # test that read returns correct values