Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f3c19558 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f3c19558 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f3c19558 Branch: refs/heads/3.0.x-fixes Commit: f3c19558cfc82c4fad28be29cda0410223b9003e Parents: 983f84e Author: Colm O hEigeartaigh <[email protected]> Authored: Wed May 24 10:29:17 2017 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed May 24 10:51:20 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/f3c19558/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 dd69e14..080f5c2 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 @@ -120,15 +120,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() {
