You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@apache.org on 2001/02/21 20:12:42 UTC

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardWrapperValve.java

craigmcc    01/02/21 11:12:41

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardWrapperValve.java
  Log:
  Correctly report the actual exception that occurred to the error page
  (via attribute "javax.servlet.error.exception"), rather than repeating the
  Class of the exception (which is already reported on attribute
  "javax.servlet.error.exception_type").
  
  Submitted by: Bryan Basham <b_...@yahoo.com>
  PR: Bugzilla #644
  
  Revision  Changes    Path
  1.18      +7 -7      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
  
  Index: StandardWrapperValve.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- StandardWrapperValve.java	2001/02/03 07:48:33	1.17
  +++ StandardWrapperValve.java	2001/02/21 19:12:38	1.18
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v 1.17 2001/02/03 07:48:33 remm Exp $
  - * $Revision: 1.17 $
  - * $Date: 2001/02/03 07:48:33 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v 1.18 2001/02/21 19:12:38 craigmcc Exp $
  + * $Revision: 1.18 $
  + * $Date: 2001/02/21 19:12:38 $
    *
    * ====================================================================
    *
  @@ -102,7 +102,7 @@
    * <code>StandardWrapper</code> container implementation.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.17 $ $Date: 2001/02/03 07:48:33 $
  + * @version $Revision: 1.18 $ $Date: 2001/02/21 19:12:38 $
    */
   
   final class StandardWrapperValve
  @@ -515,12 +515,12 @@
               //                log(" Sending to custom error page " + errorPage);
               ServletRequest sreq = request.getRequest();
               sreq.setAttribute(Globals.EXCEPTION_ATTR,
  -                              realError.getClass());
  +                              realError);
               if (sreq instanceof HttpServletRequest)
                   sreq.setAttribute(Globals.EXCEPTION_PAGE_ATTR,
                                     ((HttpServletRequest) sreq).getRequestURI());
  -	    request.getRequest().setAttribute(Globals.EXCEPTION_TYPE_ATTR,
  -					      realError.getClass());
  +	    sreq.setAttribute(Globals.EXCEPTION_TYPE_ATTR,
  +                              realError.getClass());
   	    if (custom(request, response, errorPage))
   		return;
   	}