Use TimeUnit to compute millis. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/451a02da Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/451a02da Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/451a02da
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: 451a02dae1dc26e57f9e40f780a25b7d210d8764 Parents: fd0320e Author: Gary Gregory <ggreg...@apache.org> Authored: Wed Aug 3 12:08:52 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Wed Aug 3 12:08:52 2016 -0700 ---------------------------------------------------------------------- .../logging/log4j/flume/appender/FlumePersistentManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/451a02da/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java ---------------------------------------------------------------------- diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java index 4877ec5..668210f 100644 --- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java +++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java @@ -221,7 +221,7 @@ public class FlumePersistentManager extends FlumeAvroManager { LOGGER.debug("Shutting down FlumePersistentManager"); worker.shutdown(); try { - worker.join(SHUTDOWN_WAIT_SECONDS * MILLIS_PER_SECOND); + worker.join(TimeUnit.SECONDS.toMillis(SHUTDOWN_WAIT_SECONDS)); } catch (final InterruptedException ie) { // Ignore the exception and shutdown. }
