You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2017/01/18 19:42:47 UTC
[08/15] logging-log4j2 git commit: LOG4J2-1748 fix
LOG4J2-1748 fix
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4fb38c62
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4fb38c62
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4fb38c62
Branch: refs/heads/master
Commit: 4fb38c620aaf62b37642387237da2a06c58b4d8c
Parents: e390ad3
Author: Mikael St�ldal <mi...@staldal.nu>
Authored: Sun Jan 15 16:32:50 2017 +0100
Committer: Mikael St�ldal <mi...@staldal.nu>
Committed: Sun Jan 15 16:32:50 2017 +0100
----------------------------------------------------------------------
.../apache/logging/log4j/core/config/ConfigurationScheduler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4fb38c62/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 f1e21e4..4c5b628 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
@@ -58,7 +58,7 @@ public class ConfigurationScheduler extends AbstractLifeCycle {
LOGGER.debug("{} shutting down threads in {}", SIMPLE_NAME, getExecutorService());
executorService.shutdown();
try {
- executorService.awaitTermination(timeout, timeUnit);
+ executorService.awaitTermination(timeoutToUse, timeUnitToUse);
} catch (final InterruptedException ie) {
executorService.shutdownNow();
try {