Merging from trunk r1617322:1617736 in the Java tree

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620337 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 4 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java
index 29cc881be7..25d109ba29 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java
@@ -33,11 +33,12 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.codehaus.jackson.map.ObjectMapper;
+
 import org.apache.qpid.server.management.plugin.HttpManagementUtil;
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.PreferencesProvider;
 import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
-import org.codehaus.jackson.map.ObjectMapper;
 
 public class LoggedOnUserPreferencesServlet extends AbstractServlet
 {
@@ -59,7 +60,7 @@ public class LoggedOnUserPreferencesServlet extends AbstractServlet
         {
             preferences = Collections.<String, Object>emptyMap();
         }
-        sendJsonResponse(preferences, response);
+        sendJsonResponse(preferences, request, response);
     }
 
     /*
@@ -88,7 +89,7 @@ public class LoggedOnUserPreferencesServlet extends AbstractServlet
         {
             preferences = Collections.<String, Object>emptyMap();
         }
-        sendJsonResponse(preferences, response);
+        sendJsonResponse(preferences, request, response);
     }
 
     /*
@@ -115,7 +116,7 @@ public class LoggedOnUserPreferencesServlet extends AbstractServlet
         {
             preferences = Collections.<String, Object>emptyMap();
         }
-        sendJsonResponse(preferences, response);
+        sendJsonResponse(preferences, request, response);
     }
 
     private String getAuthenticatedUserName(HttpServletRequest request)