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 2021/12/16 20:51:39 UTC

[logging-log4j2] branch release-2.x updated: Use another try-with-resources.

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/release-2.x by this push:
     new aba76eb  Use another try-with-resources.
aba76eb is described below

commit aba76ebc4063b9ddb39f32886bf5148fc701843d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Dec 16 15:51:37 2021 -0500

    Use another try-with-resources.
---
 .../log4j/config/PropertiesConfigurationTest.java  | 37 +++++++++++-----------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/PropertiesConfigurationTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/PropertiesConfigurationTest.java
index 3eaaa71..6e7b914 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/config/PropertiesConfigurationTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/config/PropertiesConfigurationTest.java
@@ -58,26 +58,27 @@ public class PropertiesConfigurationTest {
 
     @Test
     public void testListAppender() throws Exception {
-        LoggerContext loggerContext = configure("target/test-classes/log4j1-list.properties");
-        Logger logger = LogManager.getLogger("test");
-        logger.debug("This is a test of the root logger");
-        Configuration configuration = loggerContext.getConfiguration();
-        Map<String, Appender> appenders = configuration.getAppenders();
-        ListAppender eventAppender = null;
-        ListAppender messageAppender = null;
-        for (Map.Entry<String, Appender> entry : appenders.entrySet()) {
-            if (entry.getKey().equals("list")) {
-                messageAppender = (ListAppender) ((AppenderAdapter.Adapter) entry.getValue()).getAppender();
-            } else if (entry.getKey().equals("events")) {
-                eventAppender = (ListAppender) ((AppenderAdapter.Adapter) entry.getValue()).getAppender();
+        try (LoggerContext loggerContext = configure("target/test-classes/log4j1-list.properties")) {
+            Logger logger = LogManager.getLogger("test");
+            logger.debug("This is a test of the root logger");
+            Configuration configuration = loggerContext.getConfiguration();
+            Map<String, Appender> appenders = configuration.getAppenders();
+            ListAppender eventAppender = null;
+            ListAppender messageAppender = null;
+            for (Map.Entry<String, Appender> entry : appenders.entrySet()) {
+                if (entry.getKey().equals("list")) {
+                    messageAppender = (ListAppender) ((AppenderAdapter.Adapter) entry.getValue()).getAppender();
+                } else if (entry.getKey().equals("events")) {
+                    eventAppender = (ListAppender) ((AppenderAdapter.Adapter) entry.getValue()).getAppender();
+                }
             }
+            assertNotNull("No Event Appender", eventAppender);
+            assertNotNull("No Message Appender", messageAppender);
+            List<LoggingEvent> events = eventAppender.getEvents();
+            assertTrue("No events", events != null && events.size() > 0);
+            List<String> messages = messageAppender.getMessages();
+            assertTrue("No messages", messages != null && messages.size() > 0);
         }
-        assertNotNull("No Event Appender", eventAppender);
-        assertNotNull("No Message Appender", messageAppender);
-        List<LoggingEvent> events = eventAppender.getEvents();
-        assertTrue("No events", events != null && events.size() > 0);
-        List<String> messages = messageAppender.getMessages();
-        assertTrue("No messages", messages != null && messages.size() > 0);
     }
 
     @SuppressWarnings("resource")