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 2020/11/21 23:28:32 UTC
[logging-log4j2] branch release-2.x updated: Use 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 8d741f9 Use try-with-resources.
8d741f9 is described below
commit 8d741f96dc1f57e45057919baeb6ab3b3e5cc0bb
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 18:28:27 2020 -0500
Use try-with-resources.
---
.../apache/logging/log4j/core/config/NestedLoggerConfigTest.java | 5 +----
.../log4j/core/impl/NestedLoggingFromThrowableMessageTest.java | 5 +----
.../apache/logging/log4j/core/layout/SerializedLayoutTest.java | 7 ++-----
.../apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java | 8 +-------
4 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/NestedLoggerConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/NestedLoggerConfigTest.java
index 3f39648..85346d4 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/NestedLoggerConfigTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/NestedLoggerConfigTest.java
@@ -68,14 +68,11 @@ public class NestedLoggerConfigTest {
}
private Configuration loadConfiguration(final String resourcePath) throws IOException {
- final InputStream in = getClass().getClassLoader().getResourceAsStream(resourcePath);
- try {
+ try (InputStream in = getClass().getClassLoader().getResourceAsStream(resourcePath)) {
final Configuration configuration = new XmlConfiguration(new LoggerContext("test"), new ConfigurationSource(in));
configuration.initialize();
configuration.start();
return configuration;
- } finally {
- in.close();
}
}
}
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromThrowableMessageTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromThrowableMessageTest.java
index 2f1bc04..74a346c 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromThrowableMessageTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromThrowableMessageTest.java
@@ -87,14 +87,11 @@ public class NestedLoggingFromThrowableMessageTest {
private static Set<String> readUniqueLines(final File input) throws IOException {
final Set<String> lines = new HashSet<>();
- final BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(input)));
- try {
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(input)))) {
String line;
while ((line = reader.readLine()) != null) {
assertTrue("Read duplicate line: " + line, lines.add(line));
}
- } finally {
- reader.close();
}
return lines;
}
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
index da20507..9b69e30 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
@@ -177,13 +177,10 @@ public class SerializedLayoutTest {
testSerialization();
final File file = new File(DAT_PATH);
final FileInputStream fis = new FileInputStream(file);
- final ObjectInputStream ois = useObjectInputStream ? new ObjectInputStream(fis) :
- new FilteredObjectInputStream(fis);
- try {
+ try (ObjectInputStream ois = useObjectInputStream ? new ObjectInputStream(fis) :
+ new FilteredObjectInputStream(fis)) {
final LogEvent event = (LogEvent) ois.readObject();
assertNotNull(event);
- } finally {
- ois.close();
}
}
}
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
index 919eebc..9fdc40d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
@@ -59,9 +59,7 @@ public class MockTcpSyslogServer extends MockSyslogServer {
while (!shutdown) {
try {
final byte[] buffer = new byte[4096];
- Socket socket = null;
- try {
- socket = socketServer.accept();
+ try (Socket socket = socketServer.accept()) {
socket.setSoLinger(true, 0);
final InputStream in = socket.getInputStream();
int i = in.read(buffer, 0, buffer.length);
@@ -78,10 +76,6 @@ public class MockTcpSyslogServer extends MockSyslogServer {
}
} catch (final BindException be) {
be.printStackTrace();
- } finally {
- if (socket != null) {
- socket.close();
- }
}
} catch (final Exception ex) {
if (!shutdown) {