NSDateFormatter is not thread safe according to http://developer.appl…

…e.com/library/mac/#documentation/Cocoa/Conceptual/Multithreading/ThreadSafetySummary/ThreadSafetySummary.html. Fix #6829. Former-commit-id: 8cec3c039c3f203cd37af66e349405fd2786434f
iterate-ch · Sep 13, 2012 · 3947847 · 3947847
1 parent 5d51e77
commit 3947847
Showing 1 changed file with 27 additions and 21 deletions.
diff --git a/source/ch/cyberduck/ui/cocoa/UserDefaultsDateFormatter.java b/source/ch/cyberduck/ui/cocoa/UserDefaultsDateFormatter.java
@@ -124,14 +124,16 @@ private static NSDate toDate(long milliseconds) {
      * @param natural      Use natural language
      * @return A short format string or "Unknown" if there is a problem converting the time to a string
      */
-    public synchronized String getShortFormat(final long milliseconds, boolean natural) {
-        if(-1 == milliseconds) {
-            return Locale.localizedString("Unknown");
+    public String getShortFormat(final long milliseconds, boolean natural) {
+        synchronized(shortDateFormatter) {
+            if(-1 == milliseconds) {
+                return Locale.localizedString("Unknown");
+            }
+            if(natural) {
+                return shortDateNaturalFormatter.stringFromDate(toDate(milliseconds));
+            }
+            return shortDateFormatter.stringFromDate(toDate(milliseconds));
         }
-        if(natural) {
-            return shortDateNaturalFormatter.stringFromDate(toDate(milliseconds));
-        }
-        return shortDateFormatter.stringFromDate(toDate(milliseconds));
     }
 
     /**
@@ -141,14 +143,16 @@ public synchronized String getShortFormat(final long milliseconds, boolean natur
      * @param natural      Use natural language
      * @return A medium format string or "Unknown" if there is a problem converting the time to a string
      */
-    public synchronized String getMediumFormat(final long milliseconds, boolean natural) {
-        if(-1 == milliseconds) {
-            return Locale.localizedString("Unknown");
-        }
-        if(natural) {
-            return mediumDateNaturalFormatter.stringFromDate(toDate(milliseconds));
+    public String getMediumFormat(final long milliseconds, boolean natural) {
+        synchronized(mediumDateFormatter) {
+            if(-1 == milliseconds) {
+                return Locale.localizedString("Unknown");
+            }
+            if(natural) {
+                return mediumDateNaturalFormatter.stringFromDate(toDate(milliseconds));
+            }
+            return mediumDateFormatter.stringFromDate(toDate(milliseconds));
         }
-        return mediumDateFormatter.stringFromDate(toDate(milliseconds));
     }
 
     /**
@@ -158,13 +162,15 @@ public synchronized String getMediumFormat(final long milliseconds, boolean natu
      * @param natural      Use natural language
      * @return A long format string or "Unknown" if there is a problem converting the time to a string
      */
-    public synchronized String getLongFormat(final long milliseconds, boolean natural) {
-        if(-1 == milliseconds) {
-            return Locale.localizedString("Unknown");
-        }
-        if(natural) {
-            return longDateNaturalFormatter.stringFromDate(toDate(milliseconds));
+    public String getLongFormat(final long milliseconds, boolean natural) {
+        synchronized(longDateFormatter) {
+            if(-1 == milliseconds) {
+                return Locale.localizedString("Unknown");
+            }
+            if(natural) {
+                return longDateNaturalFormatter.stringFromDate(toDate(milliseconds));
+            }
+            return longDateFormatter.stringFromDate(toDate(milliseconds));
         }
-        return longDateFormatter.stringFromDate(toDate(milliseconds));
     }
 }