remm 01/11/12 16:42:43
Modified: catalina/src/share/org/apache/catalina/valves Tag:
tomcat_40_branch ErrorDispatcherValve.java
Log:
- Wrapper could be null when the request was incompletely mapped, which often
happened when using an authenticator valve.
Revision Changes Path
No revision
No revision
1.5.2.2 +10 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java
Index: ErrorDispatcherValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- ErrorDispatcherValve.java 2001/10/04 19:28:13 1.5.2.1
+++ ErrorDispatcherValve.java 2001/11/13 00:42:43 1.5.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java,v
1.5.2.1 2001/10/04 19:28:13 remm Exp $
- * $Revision: 1.5.2.1 $
- * $Date: 2001/10/04 19:28:13 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java,v
1.5.2.2 2001/11/13 00:42:43 remm Exp $
+ * $Revision: 1.5.2.2 $
+ * $Date: 2001/11/13 00:42:43 $
*
* ====================================================================
*
@@ -104,7 +104,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
- * @version $Revision: 1.5.2.1 $ $Date: 2001/10/04 19:28:13 $
+ * @version $Revision: 1.5.2.2 $ $Date: 2001/11/13 00:42:43 $
*/
public class ErrorDispatcherValve
@@ -234,8 +234,9 @@
sreq.setAttribute(Globals.EXCEPTION_ATTR,
throwable);
Wrapper wrapper = request.getWrapper();
- sreq.setAttribute(Globals.SERVLET_NAME_ATTR,
- wrapper.getName());
+ if (wrapper != null)
+ sreq.setAttribute(Globals.SERVLET_NAME_ATTR,
+ wrapper.getName());
if (sreq instanceof HttpServletRequest)
sreq.setAttribute(Globals.EXCEPTION_PAGE_ATTR,
((HttpServletRequest) sreq).getRequestURI());
@@ -287,8 +288,9 @@
sreq.setAttribute(Globals.ERROR_MESSAGE_ATTR,
message);
Wrapper wrapper = request.getWrapper();
- sreq.setAttribute(Globals.SERVLET_NAME_ATTR,
- wrapper.getName());
+ if (wrapper != null)
+ sreq.setAttribute(Globals.SERVLET_NAME_ATTR,
+ wrapper.getName());
if (sreq instanceof HttpServletRequest)
sreq.setAttribute(Globals.EXCEPTION_PAGE_ATTR,
((HttpServletRequest) sreq).getRequestURI());
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
