Merge pull request cucumber#617 from cucumber/time-converter-simple-date-format-and-thread-safety

TimeConverter used to use the SimpleDateFormat

Author: Dmytro Chyzhykov

core/src/main/java/cucumber/runtime/xstream/TimeConverter.java

@@ -15,7 +15,7 @@
 
 abstract class TimeConverter<T> extends ConverterWithFormat<T> {
     private final List<DateFormat> formats = new ArrayList<DateFormat>();
-    private SimpleDateFormat onlyFormat;
+    private String format;
 
     TimeConverter(Locale locale, Class[] convertibleTypes) {
         super(convertibleTypes);
@@ -37,7 +37,14 @@ void add(DateFormat dateFormat) {
     }
 
     public List<? extends Format> getFormats() {
-        return onlyFormat == null ? formats : asList(onlyFormat);
+        return format == null ? formats : asList(getOnlyFormat());
+    }
+
+    private Format getOnlyFormat() {
+        DateFormat dateFormat = new SimpleDateFormat(format, getLocale());
+        dateFormat.setLenient(false);
+
+        return dateFormat;
     }
 
     @Override
@@ -51,14 +58,14 @@ public String toString(Object obj) {
     @Override
     public void setParameterInfoAndLocale(ParameterInfo parameterInfo, Locale locale) {
         super.setParameterInfoAndLocale(parameterInfo, locale);
+
         if (parameterInfo.getFormat() != null) {
-            onlyFormat = new SimpleDateFormat(parameterInfo.getFormat(), locale);
-            onlyFormat.setLenient(false);
+            format = parameterInfo.getFormat();
         }
     }
 
     public void removeOnlyFormat() {
-        onlyFormat = null;
+        format = null;
     }
 
     public static List<Class> getTimeClasses() {