You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2013/04/17 14:45:12 UTC

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

Author: orudyy
Date: Wed Apr 17 12:45:11 2013
New Revision: 1468875

URL: http://svn.apache.org/r1468875
Log:
QPID-4746, QPID-4747: Complete partial change in previous commit

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

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.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/SaslServlet.java?rev=1468875&r1=1468874&r2=1468875&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java Wed Apr 17 12:45:11 2013
@@ -41,6 +41,7 @@ import javax.servlet.http.HttpServletRes
 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 Abstrac
 
     private SubjectCreator getSubjectCreator(HttpServletRequest request)
     {
-        return getBroker().getSubjectCreator(HttpManagementUtil.getSocketAddress(request));
+        SocketAddress localAddress = HttpManagementUtil.getSocketAddress(request);
+        return HttpManagementUtil.getManagementConfiguration(getServletContext()).getSubjectCreator(localAddress);
     }
 
     @Override



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