[logging-log4j2] branch master updated: LOG4J2-2813 - serializeToBytes was checking wrong variable for null

[rgoers]

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

rgoers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/master by this push:
     new 8229ae4  LOG4J2-2813 - serializeToBytes was checking wrong variable 
for null
8229ae4 is described below

commit 8229ae44ca72dbd664ee879373d2f722181ae6ce
Author: Ralph Goers <rgo...@apache.org>
AuthorDate: Fri Apr 17 15:56:04 2020 -0700

    LOG4J2-2813 - serializeToBytes was checking wrong variable for null
---
 .../org/apache/logging/log4j/core/layout/AbstractStringLayout.java     | 2 +-
 src/changes/changes.xml                                                | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
index 76c00b2..0bb2b94 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
@@ -279,7 +279,7 @@ public abstract class AbstractStringLayout extends 
AbstractLayout<String> implem
 
     protected byte[] serializeToBytes(final Serializer serializer, final 
byte[] defaultValue) {
         final String serializable = serializeToString(serializer);
-        if (serializer == null) {
+        if (serializable == null) {
             return defaultValue;
         }
         return StringEncoder.toBytes(serializable, getCharset());
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index b8783e2..d0a864a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -169,6 +169,9 @@
       </action>
     </release>
     <release version="2.13.2" date="2020-MM-DD" description="GA Release 
2.13.2">
+      <action issue="LOG4J2-2813" dev="rgoers" type="fix" due-to="Keith D 
Gregory">
+        serializeToBytes was checking wrong variable for null.
+      </action>
       <action issue="LOG4J2-2814" dev="rgoers" type="fix">
         Fix Javadoc for ScriptPatternSelector.
       </action>