diff options
| author | Florian Frank <flori@ping.de> | 2011-07-04 18:04:14 +0200 |
|---|---|---|
| committer | Florian Frank <flori@ping.de> | 2011-07-04 18:04:14 +0200 |
| commit | 58a54defa3344f94b211b1d3b5e1a6e24e4054b0 (patch) | |
| tree | e8d11a478a55f6d317b80b135eefaf3d090d883b /java/src/json/ext/Generator.java | |
| parent | 738a65c873f7ecc82352fbd516aadfec67063fc8 (diff) | |
| parent | 1a9725371131300e3230b4b9c14e669d334f4152 (diff) | |
| download | json-58a54defa3344f94b211b1d3b5e1a6e24e4054b0.tar.gz | |
Merge branch 'fix_memory_leak' of https://github.com/bigfix/json into development
Diffstat (limited to 'java/src/json/ext/Generator.java')
| -rw-r--r-- | java/src/json/ext/Generator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/json/ext/Generator.java b/java/src/json/ext/Generator.java index 92fd90e..fbc394f 100644 --- a/java/src/json/ext/Generator.java +++ b/java/src/json/ext/Generator.java @@ -376,9 +376,9 @@ public final class Generator { RubyString src; if (info.encodingsSupported() && - object.encoding(session.getContext()) != info.utf8) { + object.encoding(session.getContext()) != info.utf8.get()) { src = (RubyString)object.encode(session.getContext(), - info.utf8); + info.utf8.get()); } else { src = object; } |