QPID-4746, QPID-4747: Complete partial change in previous commit

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

1 files changed, 3 insertions, 1 deletions

diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java b/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
index 3053d36c61..b67c83dc7a 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
+++ b/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
@@ -41,6 +41,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.net.SocketAddress;
 import java.security.Principal;
 import java.security.SecureRandom;
 import java.util.LinkedHashMap;
@@ -276,7 +277,8 @@ public class SaslServlet extends AbstractServlet
 
     private SubjectCreator getSubjectCreator(HttpServletRequest request)
     {
-        return getBroker().getSubjectCreator(HttpManagementUtil.getSocketAddress(request));
+        SocketAddress localAddress = HttpManagementUtil.getSocketAddress(request);
+        return HttpManagementUtil.getManagementConfiguration(getServletContext()).getSubjectCreator(localAddress);
     }
 
     @Override