diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/java/PsychParser.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ext/java/PsychParser.java b/ext/java/PsychParser.java index ec00501..b3e747e 100644 --- a/ext/java/PsychParser.java +++ b/ext/java/PsychParser.java @@ -158,10 +158,15 @@ public class PsychParser extends RubyObject { // fall back on IOInputStream, using default charset if (yaml.respondsTo("read")) { - Encoding enc = (yaml instanceof RubyIO) - ? ((RubyIO)yaml).getReadEncoding() - : UTF8Encoding.INSTANCE; - Charset charset = enc.getCharset(); + Charset charset = null; + if (yaml instanceof RubyIO) { + Encoding enc = ((RubyIO) yaml).getReadEncoding(); + charset = enc.getCharset(); + } + if (charset == null) { + // If we can't get it from the IO or it doesn't have a charset, fall back on UTF-8 + charset = UTF8Encoding.INSTANCE.getCharset(); + } return new StreamReader(new InputStreamReader(new IOInputStream(yaml), charset)); } else { throw runtime.newTypeError(yaml, runtime.getIO()); |