summaryrefslogtreecommitdiff
path: root/java/src/json/ext/OptionsReader.java
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2011-07-04 18:04:14 +0200
committerFlorian Frank <flori@ping.de>2011-07-04 18:04:14 +0200
commit58a54defa3344f94b211b1d3b5e1a6e24e4054b0 (patch)
treee8d11a478a55f6d317b80b135eefaf3d090d883b /java/src/json/ext/OptionsReader.java
parent738a65c873f7ecc82352fbd516aadfec67063fc8 (diff)
parent1a9725371131300e3230b4b9c14e669d334f4152 (diff)
downloadjson-58a54defa3344f94b211b1d3b5e1a6e24e4054b0.tar.gz
Merge branch 'fix_memory_leak' of https://github.com/bigfix/json into development
Diffstat (limited to 'java/src/json/ext/OptionsReader.java')
-rw-r--r--java/src/json/ext/OptionsReader.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/json/ext/OptionsReader.java b/java/src/json/ext/OptionsReader.java
index 018ace4..c9c9c94 100644
--- a/java/src/json/ext/OptionsReader.java
+++ b/java/src/json/ext/OptionsReader.java
@@ -84,8 +84,8 @@ final class OptionsReader {
RubyString str = value.convertToString();
RuntimeInfo info = getRuntimeInfo();
- if (info.encodingsSupported() && str.encoding(context) != info.utf8) {
- str = (RubyString)str.encode(context, info.utf8);
+ if (info.encodingsSupported() && str.encoding(context) != info.utf8.get()) {
+ str = (RubyString)str.encode(context, info.utf8.get());
}
return str;
}