[1/3] cxf git commit: CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes eeae9d07b -> 310e52e97


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/983f84e2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/983f84e2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/983f84e2

Branch: refs/heads/3.0.x-fixes
Commit: 983f84e298c6cb20e7a5d7373fe5af1a69352705
Parents: eeae9d0
Author: Colm O hEigeartaigh 
Authored: Wed May 24 10:28:16 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed May 24 10:51:17 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/983f84e2/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 d54ab14..dd69e14 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());
@@ -85,6 +85,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) ? "" : value.toString();
@@ -114,9 +120,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() {

[2/3] cxf git commit: CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe

[coheigea]

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 
Authored: Wed May 24 10:28:16 2017 +0100
Committer: Colm O hEigeartaigh 
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) ? "" : 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() {

cxf git commit: CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master c2517eb55 -> ee62e3c37


CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ee62e3c3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ee62e3c3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ee62e3c3

Branch: refs/heads/master
Commit: ee62e3c371cd7d41796cba09f110f5cff12f5060
Parents: c2517eb
Author: Colm O hEigeartaigh 
Authored: Wed May 24 10:28:16 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed May 24 10:28:16 2017 +0100

--
 .../org/apache/cxf/sts/event/map/MapEventLogger.java| 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ee62e3c3/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 bc5bc2d..f321948 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) ? "" : value.toString();
@@ -116,8 +122,8 @@ public class MapEventLogger implements MapEventListener {
 this.logFieldname = logFieldname;
 }
 
-public void setDateFormat(String format) {
-this.dateFormat = new SimpleDateFormat(format);
+public void setDateFormat(String dateFormat) {
+this.format = dateFormat;
 }
 
 public String getLogLevel() {