Repository: logging-log4j2
Updated Branches:
  refs/heads/master 06bb5f05d -> 596461517


Use one-liner to compute scheduledItem value.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/59646151
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/59646151
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/59646151

Branch: refs/heads/master
Commit: 59646151711f4e368bfb894ac2ac6461d101877d
Parents: 06bb5f0
Author: Gary Gregory <ggreg...@apache.org>
Authored: Mon Sep 5 14:57:38 2016 -0400
Committer: Gary Gregory <ggreg...@apache.org>
Committed: Mon Sep 5 14:57:38 2016 -0400

----------------------------------------------------------------------
 .../apache/logging/log4j/core/config/ConfigurationScheduler.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/59646151/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
----------------------------------------------------------------------
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
index 930cd0c..4e88204 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
@@ -45,9 +45,7 @@ public class ConfigurationScheduler extends AbstractLifeCycle 
{
         super.start();
         if (scheduledItems > 0) {
             LOGGER.debug("Starting {} Log4j2 Scheduled threads", 
scheduledItems);
-            if (scheduledItems > MAX_SCHEDULED_ITEMS) {
-                scheduledItems = MAX_SCHEDULED_ITEMS;
-            }
+            scheduledItems = Math.min(scheduledItems, MAX_SCHEDULED_ITEMS);
             executorService = new ScheduledThreadPoolExecutor(scheduledItems,
                     Log4jThreadFactory.createDaemonThreadFactory("Scheduled"));
         } else {

Reply via email to