LOG4J2-1121 organized imports, validate constructor parameter Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ef5c4a9b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ef5c4a9b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ef5c4a9b
Branch: refs/heads/master Commit: ef5c4a9b625099901d0fea66c0a2c3d060f9f3da Parents: c5304b5 Author: rpopma <[email protected]> Authored: Sun Sep 20 07:37:45 2015 +0200 Committer: rpopma <[email protected]> Committed: Sun Sep 20 07:37:45 2015 +0200 ---------------------------------------------------------------------- .../core/config/LockingReliabilityStrategy.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ef5c4a9b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java index 9ba74e0..7bd92a6 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java @@ -17,17 +17,21 @@ package org.apache.logging.log4j.core.config; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; + import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.util.Supplier; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.locks.*; - /** * ReliabilityStrategy that counts the number of threads that have started to log an event but have not completed yet, * and waits for these threads to finish before allowing the appenders to be stopped. @@ -43,7 +47,7 @@ public class LockingReliabilityStrategy implements ReliabilityStrategy { private volatile boolean isStopping = false; public LockingReliabilityStrategy(final LoggerConfig loggerConfig) { - this.loggerConfig = loggerConfig; + this.loggerConfig = Objects.requireNonNull(loggerConfig, "loggerConfig was null"); } /* (non-Javadoc)
