Repository: logging-log4j2 Updated Branches: refs/heads/master 81f982555 -> 4ceff8eec
Protect test tearDown from NPEs in the event there are problems in the tests. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4ceff8ee Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4ceff8ee Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4ceff8ee Branch: refs/heads/master Commit: 4ceff8eec0f3ee754aa8e4cad1c64c2cf4f285bd Parents: 81f9825 Author: Gary Gregory <[email protected]> Authored: Wed Oct 17 18:53:10 2018 -0600 Committer: Gary Gregory <[email protected]> Committed: Wed Oct 17 18:53:10 2018 -0600 ---------------------------------------------------------------------- .../log4j/core/appender/rewrite/RewriteAppenderTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4ceff8ee/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppenderTest.java index fb87ad9..73082e9 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppenderTest.java @@ -55,8 +55,12 @@ public class RewriteAppenderTest { @After public void tearDown() throws Exception { - app.clear(); - app2.clear(); + if (app != null) { + app.clear(); + } + if (app2 != null) { + app2.clear(); + } } @Test
