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 02466fb374dd7b2acd09cfa8fdeea5e3e86230c7 Author: Gary Gregory <[email protected]> AuthorDate: Fri Feb 4 16:14:48 2022 -0500 Don't be verbose by specifying the default value for an atomic boolean. Conflicts: log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/ConsoleAppenderBuilder.java log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/FileAppenderBuilder.java log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/HtmlLayoutBuilder.java src/changes/changes.xml --- .../log4j/builders/appender/DailyRollingFileAppenderBuilder.java | 2 +- .../java/org/apache/log4j/builders/appender/FileAppenderBuilder.java | 2 +- .../org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java | 2 +- .../main/java/org/apache/log4j/builders/layout/HtmlLayoutBuilder.java | 2 +- .../logging/log4j/core/appender/AsyncAppenderEventDispatcher.java | 2 +- .../logging/log4j/core/appender/nosql/AbstractNoSqlConnection.java | 2 +- .../logging/log4j/core/config/AwaitCompletionReliabilityStrategy.java | 2 +- .../java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java | 2 +- src/changes/changes.xml | 3 +++ 9 files changed, 11 insertions(+), 8 deletions(-) diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java index eaf7c00..8ee058b 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java @@ -73,7 +73,7 @@ public class DailyRollingFileAppenderBuilder extends AbstractBuilder implements Holder<String> level = new Holder<>(); Holder<Boolean> immediateFlush = new BooleanHolder(true); Holder<Boolean> append = new BooleanHolder(true); - Holder<Boolean> bufferedIo = new BooleanHolder(false); + Holder<Boolean> bufferedIo = new BooleanHolder(); Holder<Integer> bufferSize = new Holder<>(8192); Holder<String> datePattern = new Holder<>(DEFAULT_DATE_PATTERN); forEachElement(appenderElement.getChildNodes(), (currentElement) -> { diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/FileAppenderBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/FileAppenderBuilder.java index 857e21e..2e3e9a4 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/FileAppenderBuilder.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/FileAppenderBuilder.java @@ -69,7 +69,7 @@ public class FileAppenderBuilder extends AbstractBuilder implements AppenderBuil Holder<String> level = new Holder<>(); Holder<Boolean> immediateFlush = new BooleanHolder(true); Holder<Boolean> append = new BooleanHolder(true); - Holder<Boolean> bufferedIo = new BooleanHolder(false); + Holder<Boolean> bufferedIo = new BooleanHolder(); Holder<Integer> bufferSize = new Holder<>(8192); forEachElement(appenderElement.getChildNodes(), (currentElement) -> { switch (currentElement.getTagName()) { diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java index d7abfc7..8923794 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java @@ -73,7 +73,7 @@ public class RollingFileAppenderBuilder extends AbstractBuilder implements Appen Holder<String> fileName = new Holder<>(); Holder<Boolean> immediateFlush = new BooleanHolder(true); Holder<Boolean> append = new BooleanHolder(true); - Holder<Boolean> bufferedIo = new BooleanHolder(false); + Holder<Boolean> bufferedIo = new BooleanHolder(); Holder<Integer> bufferSize = new Holder<>(8192); Holder<String> maxSize = new Holder<>(DEFAULT_MAX_SIZE); Holder<String> maxBackups = new Holder<>(DEFAULT_MAX_BACKUPS); 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 fc32f32..c800ed4 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 @@ -54,7 +54,7 @@ public class HtmlLayoutBuilder extends AbstractBuilder implements LayoutBuilder @Override public Layout parseLayout(Element layoutElement, XmlConfiguration config) { final Holder<String> title = new Holder<>("Log4J Log Messages"); - final Holder<Boolean> locationInfo = new BooleanHolder(false); + final Holder<Boolean> locationInfo = new BooleanHolder(); forEachElement(layoutElement.getElementsByTagName("param"), (currentElement) -> { if (currentElement.getTagName().equals(PARAM_TAG)) { if (TITLE_PARAM.equalsIgnoreCase(currentElement.getAttribute("name"))) { diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppenderEventDispatcher.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppenderEventDispatcher.java index 6b7728e..b2d0b66 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppenderEventDispatcher.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppenderEventDispatcher.java @@ -54,7 +54,7 @@ class AsyncAppenderEventDispatcher extends Log4jThread { this.errorAppender = errorAppender; this.appenders = appenders; this.queue = queue; - this.stoppedRef = new AtomicBoolean(false); + this.stoppedRef = new AtomicBoolean(); } @Override diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/AbstractNoSqlConnection.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/AbstractNoSqlConnection.java index 67145c6..15d8d2f 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/AbstractNoSqlConnection.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/AbstractNoSqlConnection.java @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicBoolean; */ public abstract class AbstractNoSqlConnection<W, T extends NoSqlObject<W>> implements NoSqlConnection<W, T> { - private final AtomicBoolean closed = new AtomicBoolean(false); + private final AtomicBoolean closed = new AtomicBoolean(); @Override public void close() { diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitCompletionReliabilityStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitCompletionReliabilityStrategy.java index e9031e8..c3f8443 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitCompletionReliabilityStrategy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitCompletionReliabilityStrategy.java @@ -38,7 +38,7 @@ import org.apache.logging.log4j.util.Supplier; public class AwaitCompletionReliabilityStrategy implements ReliabilityStrategy { private static final int MAX_RETRIES = 3; private final AtomicInteger counter = new AtomicInteger(); - private final AtomicBoolean shutdown = new AtomicBoolean(false); + private final AtomicBoolean shutdown = new AtomicBoolean(); private final Lock shutdownLock = new ReentrantLock(); private final Condition noLogEvents = shutdownLock.newCondition(); // should only be used when shutdown == true private final LoggerConfig loggerConfig; diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java index 8d39eb4..976b842 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java @@ -58,7 +58,7 @@ public class LoggerConfigBenchmark { private final boolean includeLocation = true; private LoggerConfig parent; private final AtomicInteger counter = new AtomicInteger(); - private final AtomicBoolean shutdown = new AtomicBoolean(false); + private final AtomicBoolean shutdown = new AtomicBoolean(); private final Lock shutdownLock = new ReentrantLock(); private final Condition noLogEvents = shutdownLock.newCondition(); // should only be used when shutdown == true private final LogEvent LOGEVENT = createLogEventWithoutException(); diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 03d4f36..2dc1337 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -319,6 +319,9 @@ <action dev="ggregory" type="fix" due-to="Gary Gregory"> Log4j 1.2 bridge creates a SocketAppender instead of a SyslogAppender. </action> + <action dev="ggregory" type="fix" due-to="Piotr P. Karwasz"> + Log4j 1.2 bridge uses some incorrect default property values in some appenders. + </action> <action dev="ggregory" type="fix" due-to="Gary Gregory, Piotr P. Karwasz"> </action> <action dev="ggregory" type="fix">
