Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6c70b024 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6c70b024 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6c70b024 Branch: refs/heads/3.1.x-fixes Commit: 6c70b024d2f4aac172114bc71683442e035674af Parents: 742c38c Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Wed May 24 10:29:17 2017 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Wed May 24 10:29:17 2017 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/cxf/sts/event/map/MapEventLogger.java | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6c70b024/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 633744c..6eb9dd5 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 @@ -121,15 +121,9 @@ 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() {
