Author: markt Date: Thu Nov 23 12:05:58 2006 New Revision: 478655 URL: http://svn.apache.org/viewvc?view=rev&rev=478655 Log: Fix bug 41020. Improve error message when custom error reporting valve fails and remove requirement for error reporting valves to extend ValveBase.
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java tomcat/container/tc5.5.x/webapps/docs/changelog.xml Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java?view=diff&rev=478655&r1=478654&r2=478655 ============================================================================== --- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java (original) +++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java Thu Nov 23 12:05:58 2006 @@ -128,11 +128,6 @@ "org.apache.catalina.valves.ErrorReportValve"; /** - * The object name for the errorReportValve. - */ - private ObjectName errorReportValveObjectName = null; - - /** * The descriptive information string for this implementation. */ private static final String info = @@ -715,23 +710,21 @@ && (!errorReportValveClass.equals(""))) { try { boolean found = false; - if(errorReportValveObjectName != null) { - ObjectName[] names = - ((StandardPipeline)pipeline).getValveObjectNames(); - for (int i=0; !found && i<names.length; i++) - if(errorReportValveObjectName.equals(names[i])) - found = true ; - } - if(!found) { - Valve valve = (Valve) Class.forName(errorReportValveClass) - .newInstance(); - addValve(valve); - errorReportValveObjectName = ((ValveBase)valve).getObjectName() ; - } + Valve[] valves = + ((StandardPipeline)pipeline).getValves(); + for (int i=0; !found && i<valves.length; i++) + if(errorReportValveClass.equals( + valves[i].getClass().getName())) + found = true ; + if(!found) { + Valve valve = (Valve) Class.forName(errorReportValveClass) + .newInstance(); + addValve(valve); + } } catch (Throwable t) { log.error(sm.getString ("standardHost.invalidErrorReportValveClass", - errorReportValveClass)); + errorReportValveClass), t); } } if(log.isInfoEnabled()) { Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=478655&r1=478654&r2=478655 ============================================================================== --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Nov 23 12:05:58 2006 @@ -127,6 +127,11 @@ <fix> <bug>40929</bug>: Correct JavaDoc for StandardCalssLoader. (markt) </fix> + <fix> + <bug>41020</bug>: Improve error message when custom error report Valve + fails to load. Also remove requirement that custom error report Valves + extend ValveBase. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]