Author: sergeyb
Date: Tue Nov 2 14:19:21 2010
New Revision: 1030055
URL: http://svn.apache.org/viewvc?rev=1030055&view=rev
Log:
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.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 2 14:19:21 2010
@@ -1 +1 @@
-/cxf/trunk:1027274,1027462,1027509,1027553,1027599
+/cxf/trunk:1027274,1027462,1027509,1027553,1027599,1030053
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov 2 14:19:21 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023597-1026352,1026549,1026551,1027244,1027269,1027274,1027462,1027509,1027553,1027599,1028170,1029943
+/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023597-1026352,1026549,1026551,1027244,1027269,1027274,1027462,1027509,1027553,1027599,1028170,1029943,1030053
Modified:
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java?rev=1030055&r1=1030054&r2=1030055&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
Tue Nov 2 14:19:21 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;