You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2017/11/20 05:27:24 UTC

logging-log4j2 git commit: Fix Log4j1ConfigurationFactoryTest test that fails the build on Windows

Repository: logging-log4j2
Updated Branches:
  refs/heads/master 0c3288d83 -> 211326b32


Fix Log4j1ConfigurationFactoryTest test that fails the build on Windows


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

Branch: refs/heads/master
Commit: 211326b32450cd71282c4328378d51a85d20c6c2
Parents: 0c3288d
Author: rpopma <rp...@apache.org>
Authored: Mon Nov 20 14:27:15 2017 +0900
Committer: rpopma <rp...@apache.org>
Committed: Mon Nov 20 14:27:15 2017 +0900

----------------------------------------------------------------------
 .../org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/211326b3/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
index dae9f41..b614fe6 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue;
 import java.io.File;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.file.FileSystemException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.concurrent.TimeUnit;
@@ -170,7 +171,9 @@ public class Log4j1ConfigurationFactoryTest {
             System.out.println("expected: " + tempFileName + " Actual: " + appender.getFileName());
             assertEquals(tempFileName, appender.getFileName());
         } finally {
-            Files.deleteIfExists(tempFilePath);
+			try {
+				Files.deleteIfExists(tempFilePath);
+			} catch (FileSystemException ignored) {}
         }
 	}