community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'add-support-fixes' into 'master'

Browse Source 
Add support fixes

See merge request entgra/carbon-device-mgt!851
This commit is contained in:
Pahansith Gunathilake 2022-02-23 05:36:56 +00:00
commit ee857a75ef
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/util/HandlerUtil.java
View File

@ -49,6 +49,7 @@ import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.client.HttpClients;
import org.apache.xml.serialize.OutputFormat; import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.XMLSerializer; import org.apache.xml.serialize.XMLSerializer;
import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import org.w3c.dom.Document; import org.w3c.dom.Document;
@ -263,10 +264,18 @@ public class HandlerUtil {
if (!StringUtils.isEmpty(responseData)) { if (!StringUtils.isEmpty(responseData)) {
try { try {
JSONObject responseDataJsonObj = new JSONObject(responseData); if (responseData.startsWith("{")) {
response.put("data", responseDataJsonObj); JSONObject responseDataJsonObj = new JSONObject(responseData);
response.put("data", responseDataJsonObj);
} else if (responseData.startsWith("[")) {
JSONArray responseDataJsonArr = new JSONArray(responseData);
response.put("data", responseDataJsonArr);
} else {
log.warn("Response data is not valid json string >> " + responseData);
response.put("data", responseData);
}
} catch (JSONException e) { } catch (JSONException e) {
log.debug("Response data is not valid json string"); log.error("Response data is not passable");
response.put("data", responseData); response.put("data", responseData);
} }
} }