Fixes #3278: File.open w/ File::RDWR should write \r\n but gets should

read as \n after rewind on windows. We were missing some windows-specific logic in needsWriteConversion. With this change I get three more specs passing and no regression on MRI test suite. SHIP IT...
jruby · Mar 17, 2016 · 4496cff · 4496cff
1 parent 18121a7
commit 4496cff
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/RubyIO.java b/core/src/main/java/org/jruby/RubyIO.java
@@ -5198,10 +5198,13 @@ private boolean needsReadConversion() {
 
     // MRI: NEED_WRITECONV (FIXME: Windows has slightly different version)
     private boolean needsWriteConversion(ThreadContext context) {
-        Encoding ascii8bit = context.runtime.getEncodingService().getAscii8bitEncoding();
+        boolean notAscii8bit = enc != null && enc != context.runtime.getEncodingService().getAscii8bitEncoding();
 
-        return (enc != null && enc != ascii8bit) || openFile.isTextMode() ||
-                (ecflags & ((EncodingUtils.ECONV_DECORATOR_MASK & ~EncodingUtils.ECONV_CRLF_NEWLINE_DECORATOR)|EncodingUtils.ECONV_STATEFUL_DECORATOR_MASK)) != 0;
+        if (Platform.IS_WINDOWS) {
+            return notAscii8bit || (ecflags & ((EncodingUtils.ECONV_DECORATOR_MASK & ~EncodingUtils.ECONV_CRLF_NEWLINE_DECORATOR)|EncodingUtils.ECONV_STATEFUL_DECORATOR_MASK)) != 0;
+        } else {
+            return notAscii8bit || openFile.isTextMode() || (ecflags & (EncodingUtils.ECONV_DECORATOR_MASK|EncodingUtils.ECONV_STATEFUL_DECORATOR_MASK)) != 0;
+        }
     }
 
     // MRI: make_readconv