You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/08/18 11:46:03 UTC

logging-log4j2 git commit: Don't look up keys more than once when you do not have to.

Repository: logging-log4j2
Updated Branches:
  refs/heads/master e4976d938 -> bd291ba11


Don't look up keys more than once when you do not have to.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/bd291ba1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/bd291ba1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/bd291ba1

Branch: refs/heads/master
Commit: bd291ba1139e06ba2c438017cd94c3994a7566bb
Parents: e4976d9
Author: ggregory <gg...@apache.org>
Authored: Tue Aug 18 02:45:55 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Aug 18 02:45:55 2015 -0700

----------------------------------------------------------------------
 .../logging/log4j/core/config/AbstractConfiguration.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bd291ba1/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
index ada5900..2218166 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
@@ -625,13 +625,15 @@ public abstract class AbstractConfiguration extends AbstractFilterable implement
      */
     @Override
     public LoggerConfig getLoggerConfig(final String name) {
-        if (loggers.containsKey(name)) {
-            return loggers.get(name);
+        LoggerConfig loggerConfig = loggers.get(name);
+        if (loggerConfig != null) {
+            return loggerConfig;
         }
         String substr = name;
         while ((substr = NameUtil.getSubName(substr)) != null) {
-            if (loggers.containsKey(substr)) {
-                return loggers.get(substr);
+            loggerConfig = loggers.get(substr);
+            if (loggerConfig != null) {
+                return loggerConfig;
             }
         }
         return root;