Fix json serialization on REST protocol

orientechnologies · May 23, 2018 · 4a55ac6 · 4a55ac6
1 parent 9c3b9ae
commit 4a55ac6
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/executor/OResult.java b/core/src/main/java/com/orientechnologies/orient/core/sql/executor/OResult.java
@@ -7,6 +7,7 @@
 import com.orientechnologies.orient.core.record.OVertex;
 import com.orientechnologies.orient.core.record.impl.OBlob;
 import com.orientechnologies.orient.core.util.ODateHelper;
+import jdk.nashorn.internal.ir.debug.JSONWriter;
 
 import java.util.*;
 
@@ -214,7 +215,9 @@ default String toJson(Object val) {
   }
 
   default String encode(String s) {
-    String result = s.replaceAll("\"", "\\\\\"");
+    JSONWriter writer;
+    String result = s.replaceAll("\\\\", "\\\\\\\\");
+    result = result.replaceAll("\"", "\\\\\"");
     result = result.replaceAll("\n", "\\\\n");
     result = result.replaceAll("\t", "\\\\t");
     return result;