CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe # Conflicts: # services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7f068a29 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7f068a29 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7f068a29 Branch: refs/heads/3.1.x-fixes Commit: 7f068a29920db5eea935e9b363c24147feffab13 Parents: 42739ef Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Wed May 24 10:28:16 2017 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Wed May 24 10:28:57 2017 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/sts/event/map/MapEventLogger.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/7f068a29/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java index d69f1c5..633744c 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java @@ -37,7 +37,7 @@ public class MapEventLogger implements MapEventListener { private boolean logStacktrace; private boolean logFieldname; private Level logLevel = Level.FINE; - private DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM); + private String format; public MapEventLogger() { fieldOrder.add(KEYS.TIME.name()); @@ -86,6 +86,12 @@ public class MapEventLogger implements MapEventListener { if (value instanceof String) { return (String) value; } else if (value instanceof Date) { + DateFormat dateFormat = null; + if (format != null) { + dateFormat = new SimpleDateFormat(format); + } else { + dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM); + } return dateFormat.format(value); } else { return (value == null) ? "<null>" : value.toString(); @@ -115,9 +121,15 @@ public class MapEventLogger implements MapEventListener { public void setLogFieldname(boolean logFieldname) { this.logFieldname = logFieldname; } +<<<<<<< HEAD public void setDateFormat(String format) { this.dateFormat = new SimpleDateFormat(format); +======= + + public void setDateFormat(String dateFormat) { + this.format = dateFormat; +>>>>>>> ee62e3c371... CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe } public String getLogLevel() {
