activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject [14/18] git commit: AMQ-4856: Use application/xml as content-type in web servlet. Thanks to Fernando Ribeiro for the patch.
Date Wed, 12 Mar 2014 17:06:53 GMT
AMQ-4856: Use application/xml as content-type in web servlet. Thanks to Fernando Ribeiro for
the patch.


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/4592ccb5
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/4592ccb5
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/4592ccb5

Branch: refs/heads/activemq-5.9
Commit: 4592ccb5d44127f86d9bc13145b2bd95548a9c60
Parents: f7e38f5
Author: Claus Ibsen <claus.ibsen@gmail.com>
Authored: Fri Nov 22 10:53:07 2013 +0100
Committer: Hadrian Zbarcea <hadrian@apache.org>
Committed: Wed Mar 12 12:10:22 2014 -0400

----------------------------------------------------------------------
 .../src/main/java/org/apache/activemq/web/MessageServlet.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/4592ccb5/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
----------------------------------------------------------------------
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 a89935c..3c0dad2 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
@@ -62,7 +62,7 @@ public class MessageServlet extends MessageServletSupport {
     private long defaultReadTimeout = -1;
     private long maximumReadTimeout = 20000;
     private long requestTimeout = 1000;
-    private String defaultContentType = "text/xml";
+    private String defaultContentType = "application/xml";
 
     private final HashMap<String, WebClient> clients = new HashMap<String, WebClient>();
 
@@ -323,7 +323,7 @@ public class MessageServlet extends MessageServletSupport {
     protected String getContentType(HttpServletRequest request) {
         String value = request.getParameter("xml");
         if (value != null && "true".equalsIgnoreCase(value)) {
-            return "text/xml";
+            return "application/xml";
         }
         value = request.getParameter("json");
         if (value != null && "true".equalsIgnoreCase(value)) {


Mime
View raw message