[logging-log4j2] branch release-2.x updated: Null-guard and Javadoc.

[gg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/release-2.x by this push:
     new d696e03  Null-guard and Javadoc.
d696e03 is described below

commit d696e030748d6255127914d2513d3fd9cd656c0e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Jan 12 19:30:17 2022 -0500

    Null-guard and Javadoc.
---
 .../main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java
index e58e024..9d6472b 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java
@@ -22,6 +22,7 @@ import org.apache.log4j.spi.LoggingEvent;
 
 import java.util.Collections;
 import java.util.Enumeration;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -35,7 +36,8 @@ public class AppenderAttachableImpl implements AppenderAttachable {
     @Override
     public void addAppender(Appender newAppender) {
         if (newAppender != null) {
-            appenders.put(newAppender.getName(), newAppender);
+            // NullAppender name is null.
+            appenders.put(Objects.toString(newAppender.getName()), newAppender);
         }
     }
 
@@ -71,7 +73,8 @@ public class AppenderAttachableImpl implements AppenderAttachable {
     }
 
     /**
-     * Call the <code>doAppend</code> method on all attached appenders.
+     * Calls the <code>doAppend</code> method on all attached appenders.
+     * 
      * @param event The event to log.
      * @return The number of appenders.
      */