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 2016/06/23 23:18:19 UTC

logging-log4j2 git commit: (LOG4J2-1445) OnStartupTriggeringPolicyTest fails on Windows saying the file is used by another process.

Repository: logging-log4j2
Updated Branches:
  refs/heads/master 42c76d1c4 -> 12a2dc577


(LOG4J2-1445) OnStartupTriggeringPolicyTest fails on Windows saying the
file is used by another process.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/12a2dc57
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/12a2dc57
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/12a2dc57

Branch: refs/heads/master
Commit: 12a2dc577282e323f293d82fbd6c6648102118a8
Parents: 42c76d1
Author: Gary Gregory <gg...@apache.org>
Authored: Thu Jun 23 16:18:16 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Thu Jun 23 16:18:16 2016 -0700

----------------------------------------------------------------------
 .../rolling/OnStartupTriggeringPolicyTest.java   | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/12a2dc57/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 12e3f56..07db3b4 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
@@ -54,19 +54,22 @@ public class OnStartupTriggeringPolicyTest {
         assertTrue(size > 0);
         long timeStamp = System.currentTimeMillis() - 120000;
         target.toFile().setLastModified(timeStamp);
-        final PatternLayout layout = PatternLayout.newBuilder().withPattern("%msg")
-                .withConfiguration(configuration).build();
+        final PatternLayout layout = PatternLayout.newBuilder().withPattern("%msg").withConfiguration(configuration)
+                .build();
         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);
-        manager.initialize();
-        assertTrue(Files.exists(target));
-        assertTrue(Files.size(target) == 0);
-        assertTrue(Files.exists(rolled));
-        assertTrue(Files.size(rolled) == size);
-
+        try {
+            manager.initialize();
+            assertTrue(Files.exists(target));
+            assertTrue(Files.size(target) == 0);
+            assertTrue(Files.exists(rolled));
+            assertTrue(Files.size(rolled) == size);
+        } finally {
+            manager.release();
+        }
     }
 
     @AfterClass