SECTION: Modified Files
----------------------------
M src/com/sun/faces/context/ExternalContextImpl.java
- removed request wrappers that were put in place for
a very old Tomcat bug.
SECTION: Diffs
----------------------------
Index: src/com/sun/faces/context/ExternalContextImpl.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/context/ExternalContextImpl.java,v
retrieving revision 1.54
diff -u -r1.54 ExternalContextImpl.java
--- src/com/sun/faces/context/ExternalContextImpl.java 31 Jan 2007 19:47:53 -0000 1.54
+++ src/com/sun/faces/context/ExternalContextImpl.java 8 Mar 2007 00:49:42 -0000
@@ -123,27 +123,7 @@
// Save references to our context, request, and response
this.servletContext = sc;
- // PENDING(edburns): Craig's workaround breaks
- // TestValidatorTags.java because Cactus expects a certain type
- // to be present for the value of the request.
- if (Util.isUnitTestModeEnabled()) {
- this.request = request;
- } else {
- // PENDING(craigmcc) - Work around a Tomcat 4.1 and 5.0 bug
- // where the request wrapper used on a
- // RequestDispatcher.forward() call delegates
- // removeAttribute() and setAttribute() to the wrapped
- // request, but not getAttribute(). This causes attributes
- // set via the RequestMap returned in this class to not be
- // visible via calls to getAttribute() on the underlying
- // request.
- if (request instanceof HttpServletRequest) {
- this.request = new MyHttpServletRequestWrapper
- ((HttpServletRequest) request);
- } else {
- this.request = new MyServletRequestWrapper(request);
- }
- }
+ this.request = request;
this.response = response;
WebConfiguration config = WebConfiguration.getInstance(sc);
if (config
@@ -1547,53 +1527,3 @@
}
} // END InitParameterMap
-
-
-class MyServletRequestWrapper extends ServletRequestWrapper {
-
- public MyServletRequestWrapper(ServletRequest request) {
- super(request);
- }
-
-
- public Object getAttribute(String key) {
- Object result = super.getAttribute(key);
- if (result == null) {
- ServletRequest wrapped = getRequest();
- if ((wrapped != null) &&
- (wrapped instanceof ServletRequestWrapper)) {
- wrapped = ((ServletRequestWrapper) wrapped).getRequest();
- }
- if (wrapped != null) {
- result = wrapped.getAttribute(key);
- }
- }
- return (result);
- }
-
-}
-
-
-class MyHttpServletRequestWrapper extends HttpServletRequestWrapper {
-
- public MyHttpServletRequestWrapper(HttpServletRequest request) {
- super(request);
- }
-
-
- public Object getAttribute(String key) {
- Object result = super.getAttribute(key);
- if (result == null) {
- ServletRequest wrapped = getRequest();
- if ((wrapped != null) &&
- (wrapped instanceof ServletRequestWrapper)) {
- wrapped = ((ServletRequestWrapper) wrapped).getRequest();
- }
- if (wrapped != null) {
- result = wrapped.getAttribute(key);
- }
- }
- return (result);
- }
-
-}