luehe       2004/04/12 17:28:07

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardHostValve.java
  Log:
  Small optimization of Mark's patch: Avoid repeated call to findErrorPage() if 
'realError' and 'throwable' are identical ('realError' may be different from 
'throwable' only if 'throwable' is an instance of ServletException)
  
  Revision  Changes    Path
  1.18      +2 -3      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
  
  Index: StandardHostValve.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- StandardHostValve.java    12 Apr 2004 20:30:40 -0000      1.17
  +++ StandardHostValve.java    13 Apr 2004 00:28:07 -0000      1.18
  @@ -193,8 +193,7 @@
           }
   
           ErrorPage errorPage = findErrorPage(context, throwable);
  -
  -        if ((errorPage == null) && (throwable instanceof ServletException)) {
  +        if ((errorPage == null) && (realError != throwable)) {
               errorPage = findErrorPage(context, realError);
           }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to