From ac6538b2a4a1cf920b7a28e1c006f9825cd44594 Mon Sep 17 00:00:00 2001
From: Mike McKay <mfmckay@wustl.edu>
Date: Wed, 11 May 2016 10:28:59 -0500
Subject: [PATCH] Temporary fix to get the configuration working so Charlie can
test.
---
.../java/org/nrg/xnat/restlet/services/SettingsRestlet.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/nrg/xnat/restlet/services/SettingsRestlet.java b/src/main/java/org/nrg/xnat/restlet/services/SettingsRestlet.java
index 8b347094..75477a76 100644
--- a/src/main/java/org/nrg/xnat/restlet/services/SettingsRestlet.java
+++ b/src/main/java/org/nrg/xnat/restlet/services/SettingsRestlet.java
@@ -12,6 +12,7 @@ package org.nrg.xnat.restlet.services;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.PropertyNotFoundException;
+import org.json.JSONObject;
import org.nrg.config.entities.Configuration;
import org.nrg.config.exceptions.ConfigServiceException;
import org.nrg.dicomtools.filters.*;
@@ -108,7 +109,7 @@ public class SettingsRestlet extends SecureResource {
if (StringUtils.isBlank(_property)) {
return mediaType == MediaType.TEXT_XML ?
new ItemXMLRepresentation(_arcSpec.getItem(), mediaType) :
- new StringRepresentation("{\"ResultSet\":{\"Result\":" + toJson(getArcSpecAsMap()) + ", \"title\": \"Settings\"}}");
+ new StringRepresentation("{\"ResultSet\":{\"Result\":" + new JSONObject(getArcSpecAsMap()) + ", \"title\": \"Settings\"}}");
} else {
if (!getArcSpecAsMap().containsKey(_property)) {
throw new PropertyNotFoundException(String.format("Setting '%s' was not found in the system.", _property));
--
GitLab