Author: markt
Date: Mon Jan 21 13:14:57 2008
New Revision: 614012
URL: http://svn.apache.org/viewvc?rev=614012&view=rev
Log:
Log a warning if a duplicate listener is ignored. Result of bug 44268.
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=614012&r1=614011&r2=614012&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Mon Jan
21 13:14:57 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/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=614012&r1=614011&r2=614012&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Mon Jan 21
13:14:57 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]
