This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 7d55af76bf437cad72a43df21d31d88721267869 Author: Gary Gregory <[email protected]> AuthorDate: Sat Feb 5 16:16:35 2022 -0500 Format tweaks. Conflicts: log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java --- .../src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java index 12bb405..420c455 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java @@ -109,7 +109,7 @@ public final class Log4j1XmlLayout extends AbstractStringLayout { } @SuppressWarnings("ThrowableResultOfMethodCallIgnored") - final Throwable thrown = event.getThrown(); + final Throwable thrown = event.getThrown(); if (thrown != null) { buf.append("<log4j:throwable><