summaryrefslogtreecommitdiff
path: root/java/src/json/ext/GeneratorState.java
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2016-06-02 21:10:36 +0200
committerFlorian Frank <flori@ping.de>2016-06-02 21:11:23 +0200
commit7d2ad6d6556da03300a5aeadeeacaec563435773 (patch)
treebdf346367cb20685f8001fc2091e00b6a84a22fe /java/src/json/ext/GeneratorState.java
parenta985a0c4b074280e2a9e215ead95b1e66797b6c3 (diff)
downloadjson-7d2ad6d6556da03300a5aeadeeacaec563435773.tar.gz
Remove quirks mode
Diffstat (limited to 'java/src/json/ext/GeneratorState.java')
-rw-r--r--java/src/json/ext/GeneratorState.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/java/src/json/ext/GeneratorState.java b/java/src/json/ext/GeneratorState.java
index 11d98d0..f43087b 100644
--- a/java/src/json/ext/GeneratorState.java
+++ b/java/src/json/ext/GeneratorState.java
@@ -208,9 +208,7 @@ public class GeneratorState extends RubyObject {
public IRubyObject generate(ThreadContext context, IRubyObject obj) {
RubyString result = Generator.generateJson(context, obj, this);
RuntimeInfo info = RuntimeInfo.forRuntime(context.getRuntime());
- if (info.encodingsSupported()) {
- result.force_encoding(context, info.utf8.get());
- }
+ result.force_encoding(context, info.utf8.get());
return result;
}
@@ -412,7 +410,7 @@ public class GeneratorState extends RubyObject {
private ByteList prepareByteList(ThreadContext context, IRubyObject value) {
RubyString str = value.convertToString();
RuntimeInfo info = RuntimeInfo.forRuntime(context.getRuntime());
- if (info.encodingsSupported() && str.encoding(context) != info.utf8.get()) {
+ if (str.encoding(context) != info.utf8.get()) {
str = (RubyString)str.encode(context, info.utf8.get());
}
return str.getByteList().dup();