Repository: logging-log4j2 Updated Branches: refs/heads/master 4ffa77d68 -> cad3f2390
Clean up test shutdown hopping to fix Jenkins builds. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cad3f239 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cad3f239 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cad3f239 Branch: refs/heads/master Commit: cad3f23900f0825b8a5fb84f63bf444a29770c01 Parents: 4ffa77d Author: Gary Gregory <ggreg...@apache.org> Authored: Tue Sep 13 19:51:49 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Tue Sep 13 19:51:49 2016 -0700 ---------------------------------------------------------------------- .../log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cad3f239/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java index 942abfb..def7e7f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java @@ -21,9 +21,11 @@ import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.core.Logger; +import org.apache.logging.log4j.core.util.ExecutorServices; import org.apache.logging.log4j.junit.LoggerContextRule; import org.junit.Assert; import org.junit.ClassRule; @@ -116,7 +118,8 @@ public class JeroMqAppenderTest { Assert.assertEquals(nThreads, hello); Assert.assertEquals(nThreads, again); } finally { - executor.shutdown(); + ExecutorServices.shutdown(executor, DEFAULT_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS, + JeroMqAppenderTest.class.getSimpleName()); } }
