Revert "Remove org.json usage [run-systemtest]"

1 files changed, 10 insertions, 0 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
index c4f850307ae..31f8194b3b7 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
@@ -45,6 +45,8 @@ import com.yahoo.search.result.Hit;
 import com.yahoo.search.result.HitGroup;
 import com.yahoo.search.result.NanNumber;
 import com.yahoo.tensor.Tensor;
+import org.json.JSONArray;
+import org.json.JSONObject;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -669,6 +671,14 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
             } else if (field instanceof FieldValue) {
                 // the null below is the field which has already been written
                 ((FieldValue) field).serialize(null, new JsonWriter(generator));
+            } else if (field instanceof JSONArray || field instanceof JSONObject) {
+                // org.json returns null if the object would not result in syntactically correct JSON
+                String s = field.toString();
+                if (s == null) {
+                    generator.writeNull();
+                } else {
+                    generator.writeRawValue(s);
+                }
             } else {
                 generator.writeString(field.toString());
             }