Author: violetagg Date: Mon Nov 16 07:39:41 2015 New Revision: 1714521 URL: http://svn.apache.org/viewvc?rev=1714521&view=rev Log: Use Map<String, Logger> structure for Tomcat.pinnedLoggers. Feedback provided by kkolinko.
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1714521&r1=1714520&r2=1714521&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Mon Nov 16 07:39:41 2015 @@ -24,10 +24,8 @@ import java.net.URL; import java.security.Principal; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.Stack; import java.util.jar.JarEntry; import java.util.jar.JarFile; @@ -131,7 +129,7 @@ public class Tomcat { // after Loggers are configured but before they are used. The purpose of // this Set is to retain strong references to explicitly configured loggers // so that configuration is not lost. - private final Set<Logger> pinnedLoggers = new HashSet<>(); + private final Map<String, Logger> pinnedLoggers = new HashMap<>(); // Single engine, service, server, connector - few cases need more, // they can use server.xml @@ -669,7 +667,7 @@ public class Tomcat { public void setSilent(boolean silent) { for (String s : silences) { Logger logger = Logger.getLogger(s); - pinnedLoggers.add(logger); + pinnedLoggers.put(s, logger); if (silent) { logger.setLevel(Level.WARNING); } else { @@ -679,8 +677,9 @@ public class Tomcat { } private void silence(Host host, String ctx) { - Logger logger = Logger.getLogger(getLoggerName(host, ctx)); - pinnedLoggers.add(logger); + String loggerName = getLoggerName(host, ctx); + Logger logger = Logger.getLogger(loggerName); + pinnedLoggers.put(loggerName, logger); logger.setLevel(Level.WARNING); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org