Author: sergeyb Date: Tue Nov 2 14:21:39 2010 New Revision: 1030057 URL: http://svn.apache.org/viewvc?rev=1030057&view=rev Log: Merged revisions 1030055 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................ r1030055 | sergeyb | 2010-11-02 14:19:21 +0000 (Tue, 02 Nov 2010) | 9 lines Merged revisions 1030053 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1030053 | sergeyb | 2010-11-02 14:15:39 +0000 (Tue, 02 Nov 2010) | 1 line [CXF-3108] Updating HttpServletRequestFilter qualifier to protected ........ ................ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 2 14:21:39 2010 @@ -1,2 +1,2 @@ -/cxf/branches/2.3.x-fixes:1027513,1027608 -/cxf/trunk:1027509,1027599 +/cxf/branches/2.3.x-fixes:1027513,1027608,1030055 +/cxf/trunk:1027509,1027599,1030053 Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java?rev=1030057&r1=1030056&r2=1030057&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java (original) +++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java Tue Nov 2 14:21:39 2010 @@ -200,7 +200,7 @@ public class RequestDispatcherProvider e this.servletPath = path; } - private static class HttpServletRequestFilter extends HttpServletRequestWrapper { + protected static class HttpServletRequestFilter extends HttpServletRequestWrapper { private Map<String, String[]> params; private String path;
