summaryrefslogtreecommitdiff
path: root/qpid/java/broker-plugins/management-http
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-08-22 19:36:40 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-08-22 19:36:40 +0000
commit50848155750de045ff7099f7ea3561f41a1887b8 (patch)
treed7f036b163bb4737d3ba93bf72f594cab0d78e1a /qpid/java/broker-plugins/management-http
parentd42d6b5305b6617bd5bdc7417500e115e2346a88 (diff)
downloadqpid-python-50848155750de045ff7099f7ea3561f41a1887b8.tar.gz
QPID-6036 : [Java Broker] Allow complete virtual host initial configuration to be passed in on creation of a virtualhost node
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619918 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/management-http')
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
index 861b0c15a6..efe644ca43 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
@@ -350,7 +350,7 @@ public class RestServlet extends AbstractServlet
Writer writer = getOutputWriter(request, response);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
- mapper.writeValue(writer, output);
+ mapper.writeValue(writer, extractInitialConfig && output.size() == 1 ? output.get(0) : output);
response.setContentType("application/json");
response.setStatus(HttpServletResponse.SC_OK);