(logging-log4j2) branch main updated: Remove incorrectly passed configuration in `HtmlLayoutBuilder`

[vy]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 0dc01025f1 Remove incorrectly passed configuration in 
`HtmlLayoutBuilder`
0dc01025f1 is described below

commit 0dc01025f1cd57019c453fa0439634d92349dfa2
Author: Volkan Yazıcı <vol...@yazi.ci>
AuthorDate: Thu Dec 21 09:05:38 2023 +0100

    Remove incorrectly passed configuration in `HtmlLayoutBuilder`
---
 .../org/apache/log4j/builders/layout/HtmlLayoutBuilder.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/HtmlLayoutBuilder.java
 
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/HtmlLayoutBuilder.java
index d5e3703252..e389485b5d 100644
--- 
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/HtmlLayoutBuilder.java
+++ 
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/HtmlLayoutBuilder.java
@@ -28,7 +28,7 @@ import org.apache.log4j.bridge.LayoutWrapper;
 import org.apache.log4j.builders.AbstractBuilder;
 import org.apache.log4j.config.PropertiesConfiguration;
 import org.apache.log4j.xml.XmlConfiguration;
-import org.apache.logging.log4j.core.config.DefaultConfiguration;
+import org.apache.logging.log4j.core.config.Configuration;
 import org.apache.logging.log4j.core.layout.HtmlLayout;
 import org.apache.logging.log4j.plugins.Namespace;
 import org.apache.logging.log4j.plugins.Plugin;
@@ -64,19 +64,20 @@ public class HtmlLayoutBuilder extends 
AbstractBuilder<Layout> implements Layout
                 }
             }
         });
-        return createLayout(title.get(), locationInfo.get());
+        return createLayout(config, title.get(), locationInfo.get());
     }
 
     @Override
     public Layout parse(final PropertiesConfiguration config) {
         final String title = getProperty(TITLE_PARAM, DEFAULT_TITLE);
         final boolean locationInfo = getBooleanProperty(LOCATION_INFO_PARAM);
-        return createLayout(title, locationInfo);
+        return createLayout(config, title, locationInfo);
     }
 
-    private Layout createLayout(final String title, final boolean 
locationInfo) {
+    private static Layout createLayout(
+            final Configuration configuration, final String title, final 
boolean locationInfo) {
         return LayoutWrapper.adapt(HtmlLayout.newBuilder()
-                .setConfiguration(new DefaultConfiguration())
+                .setConfiguration(configuration)
                 .setTitle(title)
                 .setLocationInfo(locationInfo)
                 .build());