Use try-with-resources. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/13c3c247 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/13c3c247 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/13c3c247
Branch: refs/heads/LOG4J2-1553 Commit: 13c3c2479105bb46c5a904a623dc9a9007b5ebac Parents: 22c7e2f Author: Gary Gregory <ggreg...@apache.org> Authored: Sun Aug 28 13:22:30 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Sun Aug 28 13:22:30 2016 -0700 ---------------------------------------------------------------------- .../appender/MemoryMappedFileManagerTest.java | 25 +++++++++----------- .../rolling/OnStartupTriggeringPolicyTest.java | 7 ++---- 2 files changed, 13 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/13c3c247/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManagerTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManagerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManagerTest.java index 5838fb0..9f132a8 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManagerTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManagerTest.java @@ -44,18 +44,16 @@ public class MemoryMappedFileManagerTest { final boolean append = false; final boolean force = false; - final MemoryMappedFileManager manager = MemoryMappedFileManager.getFileManager(file.getAbsolutePath(), append, - force, mapSize, null, null); - - byte[] msg; + try (final MemoryMappedFileManager manager = MemoryMappedFileManager.getFileManager(file.getAbsolutePath(), + append, force, mapSize, null, null)) { + byte[] msg; + for (int i = 0; i < 1000; i++) { + msg = ("Message " + i + "\n").getBytes(); + manager.write(msg, 0, msg.length, false); + } - for (int i = 0; i < 1000; i++) { - msg = ("Message " + i + "\n").getBytes(); - manager.write(msg, 0, msg.length, false); } - manager.close(); - try (BufferedReader reader = new BufferedReader(new FileReader(file))) { String line = reader.readLine(); for (int i = 0; i < 1000; i++) { @@ -83,11 +81,10 @@ public class MemoryMappedFileManagerTest { final boolean isAppend = true; final boolean isForce = false; - final MemoryMappedFileManager manager = MemoryMappedFileManager.getFileManager(file.getAbsolutePath(), - isAppend, isForce, MemoryMappedFileManager.DEFAULT_REGION_LENGTH, null, null); - - manager.write(new byte[initialLength], 0, initialLength); - manager.close(); + try (final MemoryMappedFileManager manager = MemoryMappedFileManager.getFileManager(file.getAbsolutePath(), + isAppend, isForce, MemoryMappedFileManager.DEFAULT_REGION_LENGTH, null, null)) { + manager.write(new byte[initialLength], 0, initialLength); + } final int expected = initialLength * 2; assertEquals("appended, not overwritten", expected, file.length()); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/13c3c247/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java index 8a6864f..894ee88 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java @@ -77,17 +77,14 @@ public class OnStartupTriggeringPolicyTest { final RolloverStrategy strategy = DefaultRolloverStrategy.createStrategy(null, null, null, "0", null, true, configuration); final OnStartupTriggeringPolicy policy = OnStartupTriggeringPolicy.createPolicy(1); - final RollingFileManager manager = RollingFileManager.getFileManager(TARGET_FILE, TARGET_PATTERN, true, false, - policy, strategy, null, layout, 8192, true, false, configuration); - try { + try (final RollingFileManager manager = RollingFileManager.getFileManager(TARGET_FILE, TARGET_PATTERN, true, false, + policy, strategy, null, layout, 8192, true, false, configuration)) { manager.initialize(); String files = Arrays.toString(new File(TARGET_FOLDER).listFiles()); assertTrue(target.toString() + ", files = " + files, Files.exists(target)); assertEquals(target.toString(), 0, Files.size(target)); assertTrue("Missing: " + rolled.toString() + ", files on disk = " + files, Files.exists(rolled)); assertEquals(rolled.toString(), size, Files.size(rolled)); - } finally { - manager.close(); } }
