Author: jim Date: Mon Jan 28 06:47:11 2008 New Revision: 615899 URL: http://svn.apache.org/viewvc?rev=615899&view=rev Log: Merge r614012 from trunk:
Log a warning if a duplicate listener is ignored. Result of bug 44268. Submitted by: markt Reviewed by: jim Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=615899&r1=615898&r2=615899&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 28 06:47:11 2008 @@ -38,13 +38,6 @@ -1: remm: I believe it would need specific support for certain managers. Interested users could use their own extended manager instead. -* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44268 - Log a warning when a duplicate listener is ignored. - http://svn.apache.org/viewvc?rev=614012&view=rev - Not essential for 6.0.16 - +1: markt, remm, pero, jim - -1: - * Correct svn properties. http://people.apache.org/~rjung/patches/fix-svn-props.txt Backport of r615583 Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=615899&r1=615898&r2=615899&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties Mon Jan 28 06:47:11 2008 @@ -69,6 +69,7 @@ standardContext.applicationSkipped=Skipped installing application listeners due to previous error(s) standardContext.badRequest=Invalid request path ({0}). standardContext.crlfinurl=The URL pattern "{0}" contains a CR or LF and so can never be matched. +standardContext.duplicateListener=The listener "{0}" is already configured for this context. The duplicate definition has been ignored. standardContext.errorPage.error=Error page location {0} must start with a ''/'' standardContext.errorPage.required=ErrorPage cannot be null standardContext.errorPage.warning=WARNING: Error page location {0} must start with a ''/'' in Servlet 2.4 Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=615899&r1=615898&r2=615899&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Mon Jan 28 06:47:11 2008 @@ -1948,8 +1948,11 @@ synchronized (applicationListeners) { String results[] =new String[applicationListeners.length + 1]; for (int i = 0; i < applicationListeners.length; i++) { - if (listener.equals(applicationListeners[i])) + if (listener.equals(applicationListeners[i])) { + log.info(sm.getString( + "standardContext.duplicateListener",listener)); return; + } results[i] = applicationListeners[i]; } results[applicationListeners.length] = listener; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]