1 files changed, 8 insertions, 2 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 52c9b10e59..883da04b3d 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
@@ -330,8 +330,14 @@ public class RestServlet extends AbstractServlet
         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);