This is an automated email from the ASF dual-hosted git repository. rpopma pushed a commit to branch release-2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit d7d60c6ed73fd0facf3e6afa598edff351c74a22 Author: Remko Popma <rem...@yahoo.com> AuthorDate: Thu Apr 21 20:19:34 2022 +0900 LOG4J2-3473 update for changes made with LOG4J2-3472 --- .../log4j/core/async/DefaultAsyncWaitStrategyFactory.java | 1 - .../org/apache/logging/log4j/core/async/DisruptorUtil.java | 12 +++--------- .../log4j/core/async/AsyncWaitStrategyFactoryConfigTest.java | 1 - ...cWaitStrategyFactoryIncorrectConfigGlobalLoggersTest.java | 1 - 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncWaitStrategyFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncWaitStrategyFactory.java index bbe3af696a..a5c54ae4ed 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncWaitStrategyFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncWaitStrategyFactory.java @@ -19,7 +19,6 @@ package org.apache.logging.log4j.core.async; import com.lmax.disruptor.BlockingWaitStrategy; import com.lmax.disruptor.BusySpinWaitStrategy; import com.lmax.disruptor.SleepingWaitStrategy; -import com.lmax.disruptor.TimeoutBlockingWaitStrategy; import com.lmax.disruptor.WaitStrategy; import com.lmax.disruptor.YieldingWaitStrategy; import org.apache.logging.log4j.Logger; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorUtil.java index 4924202de0..4b45dc1e35 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorUtil.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorUtil.java @@ -17,23 +17,17 @@ package org.apache.logging.log4j.core.async; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; - -import com.lmax.disruptor.BlockingWaitStrategy; -import com.lmax.disruptor.BusySpinWaitStrategy; import com.lmax.disruptor.ExceptionHandler; -import com.lmax.disruptor.SleepingWaitStrategy; import com.lmax.disruptor.WaitStrategy; -import com.lmax.disruptor.YieldingWaitStrategy; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.core.util.Integers; import org.apache.logging.log4j.core.util.Loader; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.PropertiesUtil; -import org.apache.logging.log4j.util.Strings; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; /** * Utility methods for getting Disruptor related configuration. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncWaitStrategyFactoryConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncWaitStrategyFactoryConfigTest.java index d5d9471c4b..215ac7edb3 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncWaitStrategyFactoryConfigTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncWaitStrategyFactoryConfigTest.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.async; -import com.lmax.disruptor.TimeoutBlockingWaitStrategy; import com.lmax.disruptor.WaitStrategy; import com.lmax.disruptor.YieldingWaitStrategy; import org.apache.logging.log4j.categories.AsyncLoggers; diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncWaitStrategyFactoryIncorrectConfigGlobalLoggersTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncWaitStrategyFactoryIncorrectConfigGlobalLoggersTest.java index 7533ddd782..d6122b1c4f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncWaitStrategyFactoryIncorrectConfigGlobalLoggersTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncWaitStrategyFactoryIncorrectConfigGlobalLoggersTest.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.async; -import com.lmax.disruptor.TimeoutBlockingWaitStrategy; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.categories.AsyncLoggers; import org.apache.logging.log4j.core.LoggerContext;