You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2019/07/26 09:21:44 UTC
[activemq] branch activemq-5.15.x updated: AMQ-7242 - REST Content
Type fixes
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
new 4cfd37f AMQ-7242 - REST Content Type fixes
4cfd37f is described below
commit 4cfd37f659cb127629d2570c78b42e6b68867a97
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jul 16 13:07:17 2019 +0100
AMQ-7242 - REST Content Type fixes
---
.../src/main/java/org/apache/activemq/web/MessageServlet.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java b/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
index 1b8897c..38546d7 100644
--- a/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
+++ b/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
@@ -66,7 +66,7 @@ public class MessageServlet extends MessageServletSupport {
private long defaultReadTimeout = -1;
private long maximumReadTimeout = 20000;
private long requestTimeout = 1000;
- private String defaultContentType = "application/xml";
+ private String defaultContentType;
private final HashMap<String, WebClient> clients = new HashMap<String, WebClient>();
private final HashSet<MessageAvailableConsumer> activeConsumers = new HashSet<MessageAvailableConsumer>();
@@ -285,15 +285,16 @@ public class MessageServlet extends MessageServletSupport {
response.setHeader("Pragma", "no-cache"); // HTTP 1.0
response.setDateHeader("Expires", 0);
-
// Set content type as in request. This should be done before calling getWriter by specification
- String type = request.getContentType();
+ String type = getContentType(request);
if (type != null) {
response.setContentType(type);
} else {
- if (isXmlContent(message)) {
+ if (defaultContentType != null) {
response.setContentType(defaultContentType);
+ } else if (isXmlContent(message)) {
+ response.setContentType("application/xml");
} else {
response.setContentType("text/plain");
}