summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClemens Fuchslocher <clemens@vakuumverpackt.de>2011-02-26 19:14:43 +0100
committerClemens Fuchslocher <clemens@vakuumverpackt.de>2011-02-26 19:29:06 +0100
commit813f1dea6d5bddbe545dca94792dbfe576e9f44e (patch)
tree079bafc9ff2a95d778a3cf91b9fbe2a38d2715b3
parent514d791dd8602ad1d70d45a824927aafe44e838c (diff)
downloadjson-813f1dea6d5bddbe545dca94792dbfe576e9f44e.tar.gz
flori/json#60: Incorrect pretty-print indentation
-rw-r--r--java/src/json/ext/Generator.java6
-rwxr-xr-xtests/test_json_generate.rb1
2 files changed, 2 insertions, 5 deletions
diff --git a/java/src/json/ext/Generator.java b/java/src/json/ext/Generator.java
index 230d68f..de476c9 100644
--- a/java/src/json/ext/Generator.java
+++ b/java/src/json/ext/Generator.java
@@ -354,11 +354,7 @@ public final class Generator {
state.decreaseDepth();
if (objectNl.length() != 0) {
buffer.append(objectNl);
- if (indent.length != 0) {
- for (int i = 0; i < state.getDepth(); i++) {
- buffer.append(indent);
- }
- }
+ buffer.append(Utils.repeat(state.getIndent(), state.getDepth()));
}
buffer.append((byte)'}');
}
diff --git a/tests/test_json_generate.rb b/tests/test_json_generate.rb
index e6219df..bfaee82 100755
--- a/tests/test_json_generate.rb
+++ b/tests/test_json_generate.rb
@@ -54,6 +54,7 @@ EOT
def test_generate_pretty
json = pretty_generate(@hash)
+ assert_equal(@json3, json)
assert_equal(JSON.parse(@json3), JSON.parse(json))
parsed_json = parse(json)
assert_equal(@hash, parsed_json)