You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2017/06/24 00:46:31 UTC
logging-log4j2 git commit: Comments and bullet-proofing.
Repository: logging-log4j2
Updated Branches:
refs/heads/master b96e13342 -> 425420b0e
Comments and bullet-proofing.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/425420b0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/425420b0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/425420b0
Branch: refs/heads/master
Commit: 425420b0e61cfa325580b212ca9d7e8b9fc72f50
Parents: b96e133
Author: Gary Gregory <gg...@apache.org>
Authored: Fri Jun 23 17:46:28 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Fri Jun 23 17:46:28 2017 -0700
----------------------------------------------------------------------
.../logging/log4j/core/appender/mom/activemq/JmsAppenderIT.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/425420b0/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/JmsAppenderIT.java
----------------------------------------------------------------------
diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/JmsAppenderIT.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/JmsAppenderIT.java
index 989701e..25b3252 100644
--- a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/JmsAppenderIT.java
+++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/JmsAppenderIT.java
@@ -70,6 +70,7 @@ public class JmsAppenderIT {
"org.apache.logging.log4j.core.impl,org.apache.logging.log4j.util,org.apache.logging.log4j,java.rmi");
final Properties additional = new Properties();
additional.setProperty("queue.TestQueue", "TestQueue");
+ @SuppressWarnings("resource") // jndiManager is closed in tearDownClass() through the jmsManager
final JndiManager jndiManager = JndiManager.getJndiManager(ActiveMQInitialContextFactory.class.getName(),
"vm://localhost?broker.persistent=false", null, null, null, additional);
jmsManager = JmsManager.getJmsManager("JmsManager", jndiManager, "ConnectionFactory", "TestQueue", null, null);
@@ -77,7 +78,9 @@ public class JmsAppenderIT {
@After
public void tearDownClass() {
- jmsManager.close();
+ if (jmsManager != null) {
+ jmsManager.close();
+ }
System.getProperties().remove(KEY_SERIALIZABLE_PACKAGES);
}