You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2014/12/22 11:07:33 UTC

svn commit: r1647277 - /qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java

Author: kwall
Date: Mon Dec 22 10:07:32 2014
New Revision: 1647277

URL: http://svn.apache.org/r1647277
Log:
QPID-6276: [Java Broker] Don't set caching headers when using content-disposition attachment (prevents IE8 failure).

Modified:
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java?rev=1647277&r1=1647276&r2=1647277&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java Mon Dec 22 10:07:32 2014
@@ -330,8 +330,14 @@ public class RestServlet extends Abstrac
         response.setContentType("application/json");
         response.setStatus(HttpServletResponse.SC_OK);
 
-        setCachingHeadersOnResponse(response);
-        setContentDispositionHeaderIfNecessary(response, attachmentFilename);
+        if (attachmentFilename == null)
+        {
+            setCachingHeadersOnResponse(response);
+        }
+        else
+        {
+            setContentDispositionHeaderIfNecessary(response, attachmentFilename);
+        }
 
         Collection<ConfiguredObject<?>> allObjects = getObjects(request);
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org