Repository: logging-log4j2 Updated Branches: refs/heads/master 3b43819d6 -> d955bd544
Fix NPE when tests fail. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d955bd54 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d955bd54 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d955bd54 Branch: refs/heads/master Commit: d955bd54491fdcf265f313b2897d1532f860ab97 Parents: 3b43819 Author: Gary Gregory <ggreg...@apache.org> Authored: Fri Jul 28 17:28:25 2017 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Fri Jul 28 17:28:25 2017 -0700 ---------------------------------------------------------------------- .../AbstractJmsAppenderReconnectIT.java | 24 ++++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d955bd54/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/AbstractJmsAppenderReconnectIT.java ---------------------------------------------------------------------- diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/AbstractJmsAppenderReconnectIT.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/AbstractJmsAppenderReconnectIT.java index d457162..61f0093 100644 --- a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/AbstractJmsAppenderReconnectIT.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/AbstractJmsAppenderReconnectIT.java @@ -58,17 +58,21 @@ public class AbstractJmsAppenderReconnectIT { if (jmsClientTestConfig != null) { jmsClientTestConfig.stop(); } - // Make sure the manager is gone as to not have bad side effect on other tests. - @SuppressWarnings("resource") - final JmsManager appenderManager = appender.getManager(); - if (appenderManager != null) { - Assert.assertFalse(AbstractManager.hasManager(appenderManager.getName())); + if (appender != null) { + // Make sure the manager is gone as to not have bad side effect on other tests. + @SuppressWarnings("resource") + final JmsManager appenderManager = appender.getManager(); + if (appenderManager != null) { + Assert.assertFalse(AbstractManager.hasManager(appenderManager.getName())); + } } - // Make sure the manager is gone as to not have bad side effect on other tests. - @SuppressWarnings("resource") - final JmsManager testManager = jmsClientTestConfig.getJmsManager(); - if (testManager != null) { - Assert.assertFalse(AbstractManager.hasManager(testManager.getName())); + if (jmsClientTestConfig != null) { + // Make sure the manager is gone as to not have bad side effect on other tests. + @SuppressWarnings("resource") + final JmsManager testManager = jmsClientTestConfig.getJmsManager(); + if (testManager != null) { + Assert.assertFalse(AbstractManager.hasManager(testManager.getName())); + } } }
