This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
commit 70cb0b7d999e449cee73ec43e7cb552cc52cc9f1 Author: Christian Grobmeier <[email protected]> AuthorDate: Wed Dec 20 21:44:28 2023 +0100 prevented potential npe --- .../java/org/apache/log4j/chainsaw/TableColorizingRenderer.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java b/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java index 86ef94e..d189d1a 100644 --- a/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java +++ b/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java @@ -526,6 +526,9 @@ public class TableColorizingRenderer extends DefaultTableCellRenderer { if (dateFormatInUse != null && dateFormatTZ != null && !("".equals(dateFormatTZ))) { dateFormatInUse.setTimeZone(TimeZone.getTimeZone(dateFormatTZ)); } else { + if (this.dateFormatInUse == null) { + this.dateFormatInUse = new SimpleDateFormat(Constants.ISO8601_PATTERN); + } dateFormatInUse.setTimeZone(TimeZone.getDefault()); } } @@ -587,6 +590,9 @@ public class TableColorizingRenderer extends DefaultTableCellRenderer { if (dateFormatInUse != null && dateFormatTZ != null && !("".equals(dateFormatTZ))) { dateFormatInUse.setTimeZone(TimeZone.getTimeZone(dateFormatTZ)); } else { + if (this.dateFormatInUse == null) { + this.dateFormatInUse = new SimpleDateFormat(Constants.ISO8601_PATTERN); + } dateFormatInUse.setTimeZone(TimeZone.getDefault()); } }
