This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 8abfd929a9c6f5ff66a734d7c37e4fd72a3baaa7 Author: Gary Gregory <[email protected]> AuthorDate: Thu Feb 25 08:15:05 2021 -0500 Validate input in ctor. --- .../apache/logging/log4j/core/util/WatchManager.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java index f58f67b..41de183 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java @@ -16,19 +16,13 @@ */ package org.apache.logging.log4j.core.util; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.AbstractLifeCycle; -import org.apache.logging.log4j.core.config.ConfigurationFileWatcher; -import org.apache.logging.log4j.core.config.ConfigurationScheduler; -import org.apache.logging.log4j.status.StatusLogger; -import org.apache.logging.log4j.util.LoaderUtil; - import java.io.File; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.ServiceLoader; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; @@ -37,6 +31,13 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.AbstractLifeCycle; +import org.apache.logging.log4j.core.config.ConfigurationFileWatcher; +import org.apache.logging.log4j.core.config.ConfigurationScheduler; +import org.apache.logging.log4j.status.StatusLogger; +import org.apache.logging.log4j.util.LoaderUtil; + /** * Manages {@link FileWatcher}s. * @@ -132,7 +133,7 @@ public class WatchManager extends AbstractLifeCycle { private final ConcurrentMap<Source, ConfigurationMonitor> watchers = new ConcurrentHashMap<>(); public WatchManager(final ConfigurationScheduler scheduler) { - this.scheduler = scheduler; + this.scheduler = Objects.requireNonNull(scheduler, "scheduler"); eventServiceList = getEventServices(); }
