Merge pull request #1773 from poorva1209/develop

Resolves #1766
GRIDAPPSD · Apr 25, 2024 · 2981889 · 2981889
2 parents b60655c + d8aee9c
commit 2981889
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/process/ProcessEvent.java b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/process/ProcessEvent.java
@@ -77,6 +77,9 @@
 
 import javax.jms.Destination;
 
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+
 import pnnl.goss.core.Client;
 import pnnl.goss.core.DataError;
 import pnnl.goss.core.DataResponse;
@@ -383,6 +386,13 @@ private void sendData(Client client, Destination replyDestination, Serializable
              }
 
 			if(responseFormat == null || responseFormat.equals("JSON")) {
+				try{
+					new JSONObject(data.toString());
+				}
+				catch(JSONException e){
+					data = data.toString().replace("\"", "\\\"");
+					data = "\""+data+"\"";
+				}
 				String r = "{\"data\":"+data+",\"responseComplete\":true,\"id\":\""+processId+"\"}";
 				client.publish(replyDestination, r);
 			}