From b497ffc0efcac8a18ef6bae7203252d60047e944 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 20 Jul 2009 11:08:24 +0000 Subject: [PATCH] If TLDs are defined in web.xml, duplicates are expected so only log at debug git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@795767 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/startup/TldRuleSet.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/startup/TldRuleSet.java b/java/org/apache/catalina/startup/TldRuleSet.java index b24218e05..a35969815 100644 --- a/java/org/apache/catalina/startup/TldRuleSet.java +++ b/java/org/apache/catalina/startup/TldRuleSet.java @@ -115,8 +115,17 @@ final class TaglibUriRule extends Rule { 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; -- 2.11.0