From 5cba96caca6e11136b217a699b2b1d68e5ce80f1 Mon Sep 17 00:00:00 2001
From: Tres Finocchiaro <tres.finocchiaro@gmail.com>
Date: Wed, 6 Nov 2019 12:29:03 -0500
Subject: [PATCH] Fix indentFactor

Remove `length() == 1` conditional; fix indentFactor
---
 .../codehaus/jettison/json/JSONObject.java    | 45 ++++++++-----------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/main/java/org/codehaus/jettison/json/JSONObject.java b/src/main/java/org/codehaus/jettison/json/JSONObject.java
index 53b83bc..41cbb9d 100644
--- a/src/main/java/org/codehaus/jettison/json/JSONObject.java
+++ b/src/main/java/org/codehaus/jettison/json/JSONObject.java
@@ -1199,34 +1199,25 @@ String toString(int indentFactor, int indent) throws JSONException {
         Iterator     keys = keys();
         StringBuilder sb = new StringBuilder("{");
         int          newindent = indent + indentFactor;
-        Object       o;
-        if (n == 1) {
-            o = keys.next();
-            sb.append(quote(o.toString(), escapeForwardSlashAlways));
-            sb.append(": ");
-            sb.append(valueToString(this.myHashMap.get(o), indentFactor,
-                    indent, escapeForwardSlashAlways));
-        } else {
-            while (keys.hasNext()) {
-                o = keys.next();
-                if (sb.length() > 1) {
-                    sb.append(",\n");
-                } else {
-                    sb.append('\n');
-                }
-                for (i = 0; i < newindent; i += 1) {
-                    sb.append(' ');
-                }
-                sb.append(quote(o.toString()));
-                sb.append(": ");
-                sb.append(valueToString(this.myHashMap.get(o), indentFactor,
-                        newindent, escapeForwardSlashAlways));
-            }
+        while (keys.hasNext()) {
+            Object o = keys.next();
             if (sb.length() > 1) {
+                sb.append(",\n");
+            } else {
                 sb.append('\n');
-                for (i = 0; i < indent; i += 1) {
-                    sb.append(' ');
-                }
+            }
+            for (i = 0; i < newindent; i += 1) {
+                sb.append(' ');
+            }
+            sb.append(quote(o.toString()));
+            sb.append(": ");
+            sb.append(valueToString(this.myHashMap.get(o), indentFactor,
+                    newindent, escapeForwardSlashAlways));
+        }
+        if (sb.length() > 1) {
+            sb.append('\n');
+            for (i = 0; i < indent; i += 1) {
+                sb.append(' ');
             }
         }
         sb.append('}');
@@ -1385,4 +1376,4 @@ public Writer write(Writer writer) throws JSONException {
             throw new JSONException(e);
         }
      }
-}
\ No newline at end of file
+}