This is an automated email from the ASF dual-hosted git repository.
vy 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 dbe386b LOG4J2-2885 Fix the compilation failure caused by the
recently added FixedDateFormat entries.
dbe386b is described below
commit dbe386b27a0067947f1d87d5b2017fa7861c8398
Author: Volkan Yazici <[email protected]>
AuthorDate: Thu Aug 5 09:15:50 2021 +0200
LOG4J2-2885 Fix the compilation failure caused by the recently added
FixedDateFormat entries.
---
.../log4j/core/util/datetime/FixedDateFormat.java | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
index 2a982bd..45d8ed4 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
@@ -77,16 +77,6 @@ public class FixedDateFormat {
DATE_PERIOD("dd MMM yyyy HH:mm:ss.SSS", "dd MMM yyyy ", 0, ':', 1,
'.', 1, 3, null),
/**
- * American date/time format with 2-digit year: {@code "dd/MM/yy
HH:mm:ss.SSS"}.
- */
- US_MONTH_DAY_YEAR2_TIME("dd/MM/yy HH:mm:ss.SSS", "dd/MM/yy ", 0, ':',
1, '.', 1, 3, null),
-
- /**
- * American date/time format with 4-digit year: {@code "dd/MM/yyyy
HH:mm:ss.SSS"}.
- */
- US_MONTH_DAY_YEAR4_TIME("dd/MM/yyyy HH:mm:ss.SSS", "dd/MM/yyyy ", 0,
':', 1, '.', 1, 3, null),
-
- /**
* DEFAULT time format: {@code "yyyy-MM-dd HH:mm:ss,SSS"}.
*/
DEFAULT("yyyy-MM-dd HH:mm:ss,SSS", "yyyy-MM-dd ", 0, ':', 1, ',', 1,
3, null),
@@ -149,7 +139,17 @@ public class FixedDateFormat {
/**
* ISO8601 time format with support for microsecond precision: {@code
"yyyy-MM-dd'T'HH:mm:ss.nnnnnn"}.
*/
- ISO8601_PERIOD_MICROS("yyyy-MM-dd'T'HH:mm:ss.nnnnnn", "yyyy-MM-dd'T'",
2, ':', 1, '.', 1, 6, null);
+ ISO8601_PERIOD_MICROS("yyyy-MM-dd'T'HH:mm:ss.nnnnnn", "yyyy-MM-dd'T'",
2, ':', 1, '.', 1, 6, null),
+
+ /**
+ * American date/time format with 2-digit year: {@code "dd/MM/yy
HH:mm:ss.SSS"}.
+ */
+ US_MONTH_DAY_YEAR2_TIME("dd/MM/yy HH:mm:ss.SSS", "dd/MM/yy ", 0, ':',
1, '.', 1, 3, null),
+
+ /**
+ * American date/time format with 4-digit year: {@code "dd/MM/yyyy
HH:mm:ss.SSS"}.
+ */
+ US_MONTH_DAY_YEAR4_TIME("dd/MM/yyyy HH:mm:ss.SSS", "dd/MM/yyyy ", 0,
':', 1, '.', 1, 3, null);
private static final String DEFAULT_SECOND_FRACTION_PATTERN = "SSS";
private static final int MILLI_FRACTION_DIGITS =
DEFAULT_SECOND_FRACTION_PATTERN.length();
