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 2018/12/03 00:34:17 UTC
[logging-log4j2] 01/01: Merged from release-2.x
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch new-iso-date-time-formats
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit c8ac8b03c6030df78489f55fe6761fb4e33673b2
Merge: f205059 4e3bc73
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Dec 2 17:28:50 2018 -0700
Merged from release-2.x
.../rolling/DirectWriteRolloverStrategy.java | 3 +-
.../rolling/OnStartupTriggeringPolicy.java | 1 +
.../core/appender/rolling/PatternProcessor.java | 6 +--
.../core/appender/rolling/RollingFileManager.java | 50 ++++++++++++++++------
.../rolling/RollingRandomAccessFileManager.java | 7 ++-
.../rolling/TimeBasedTriggeringPolicy.java | 8 +++-
.../rolling/OnStartupTriggeringPolicyTest.java | 11 ++++-
...ava => RollingAppenderDirectWrite1906Test.java} | 10 ++---
.../rolling/RollingAppenderDirectWriteTest.java | 1 +
...rect-1903.xml => log4j-rolling-direct-1906.xml} | 4 +-
10 files changed, 67 insertions(+), 34 deletions(-)
diff --cc log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java
index 7a3c5ca,5f26338..1ea3aa2
--- 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
@@@ -72,7 -76,9 +76,10 @@@ public class OnStartupTriggeringPolicyT
assertTrue(size > 0);
assertEquals(copied, size);
- Assert.assertTrue(target.toFile().setLastModified(timeStamp));
+ final FileTime fileTime = FileTime.fromMillis(timeStamp);
+ final BasicFileAttributeView attrs = Files.getFileAttributeView(target, BasicFileAttributeView.class);
+ attrs.setTimes(fileTime, fileTime, fileTime);
++
final PatternLayout layout = PatternLayout.newBuilder().withPattern("%msg").withConfiguration(configuration)
.build();
final RolloverStrategy strategy = DefaultRolloverStrategy.createStrategy(null, null, null, "0", null, true,