Skip to content

Commit 8accc1d

Browse files
committed
Fixed Encoding.locale_charmap on Windows.
1 parent 9f15d60 commit 8accc1d

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2740,7 +2740,7 @@ public Node parseInline(InputStream in, String file, DynamicScope scope) {
27402740
addEvalParseToStats();
27412741
ParserConfiguration parserConfig =
27422742
new ParserConfiguration(this, 0, false, true, false, config);
2743-
setupSourceEncoding(parserConfig, getEncodingService().getConsoleEncoding());
2743+
setupSourceEncoding(parserConfig, getEncodingService().getLocaleEncoding());
27442744
return parser.parse(file, in, scope, parserConfig);
27452745
}
27462746

core/src/main/java/org/jruby/runtime/encoding/EncodingService.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,12 @@ public Entry findEncodingOrAliasEntry(byte[] bytes) {
137137

138138
// rb_locale_charmap...mostly
139139
public Encoding getLocaleEncoding() {
140+
final Encoding consoleEncoding = getConsoleEncoding();
141+
142+
if (consoleEncoding != null) {
143+
return consoleEncoding;
144+
}
145+
140146
Entry entry = findEncodingOrAliasEntry(new ByteList(Charset.defaultCharset().name().getBytes()));
141147
return entry == null ? ASCIIEncoding.INSTANCE : entry.getEncoding();
142148
}

0 commit comments

Comments
 (0)