Author: ffang Date: Tue Jul 30 01:23:19 2013 New Revision: 1508265 URL: http://svn.apache.org/r1508265 Log: Merged revisions 1508258 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................ r1508258 | ffang | 2013-07-30 08:52:36 +0800 (二, 30 7 2013) | 9 lines Merged revisions 1508257 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1508257 | ffang | 2013-07-30 08:43:46 +0800 (二, 30 7 2013) | 1 line [CXF-5165]remove unnecessary attribute from HttpServletRequest after authentication ........ ................ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1508258 Merged /cxf/trunk:r1508257 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java?rev=1508265&r1=1508264&r2=1508265&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java (original) +++ cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java Tue Jul 30 01:23:19 2013 @@ -80,6 +80,8 @@ public class ServiceListGeneratorServlet if (!authenticator.authenticate(request, response)) { return; } + request.removeAttribute(ServletController.AUTH_SERVICE_LIST); + request.removeAttribute(ServletController.AUTH_SERVICE_LIST_REALM); } PrintWriter writer = response.getWriter(); AbstractDestination[] destinations = destinationRegistry.getSortedDestinations();
