Author: markt
Date: Mon Jul 20 11:08:24 2009
New Revision: 795767
URL: http://svn.apache.org/viewvc?rev=795767&view=rev
Log:
If TLDs are defined in web.xml, duplicates are expected so only log at debug
Modified:
tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java?rev=795767&r1=795766&r2=795767&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java Mon Jul 20
11:08:24 2009
@@ -115,8 +115,17 @@
if (tldConfig.isKnownTaglibUri(text)) {
// Already seen this URI
duplicateUri = true;
- digester.getLogger().info(
- "TLD skipped. URI: " + text + " is already defined");
+ // This is expected if the URI was defined in web.xml
+ // Log message at debug in this case
+ if (tldConfig.getContext().findTaglib(text) == null) {
+ digester.getLogger().info(
+ "TLD skipped. URI: " + text + " is already defined");
+ } else {
+ if (digester.getLogger().isDebugEnabled()) {
+ digester.getLogger().debug(
+ "TLD skipped. URI: " + text + " is already
defined");
+ }
+ }
} else {
// New URI. Add it to known list and carry on
duplicateUri = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
