Repository: logging-log4j2 Updated Branches: refs/heads/master 1ebb63f93 -> 6bc42bd3d
Make lockable field final. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6bc42bd3 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6bc42bd3 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6bc42bd3 Branch: refs/heads/master Commit: 6bc42bd3da3f8af80bf2310cbafe283c82af7fac Parents: 1ebb63f Author: Matt Sicker <[email protected]> Authored: Sat Feb 27 20:21:35 2016 -0600 Committer: Matt Sicker <[email protected]> Committed: Sat Feb 27 20:21:35 2016 -0600 ---------------------------------------------------------------------- .../org/apache/logging/log4j/simple/SimpleLogger.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6bc42bd3/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java index 13ddeb5..76dc6c4 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java @@ -46,7 +46,7 @@ public class SimpleLogger extends AbstractLogger { * Note that DateFormat is not Thread-safe. * </p> */ - private DateFormat dateFormatter; + private final DateFormat dateFormatter; private Level level; @@ -82,12 +82,16 @@ public class SimpleLogger extends AbstractLogger { this.stream = stream; if (showDateTime) { + DateFormat format; try { - this.dateFormatter = new SimpleDateFormat(dateTimeFormat); + format = new SimpleDateFormat(dateTimeFormat); } catch (final IllegalArgumentException e) { // If the format pattern is invalid - use the default format - this.dateFormatter = new SimpleDateFormat(SimpleLoggerContext.DEFAULT_DATE_TIME_FORMAT); + format = new SimpleDateFormat(SimpleLoggerContext.DEFAULT_DATE_TIME_FORMAT); } + this.dateFormatter = format; + } else { + this.dateFormatter = null; } }
