From 30bb10a870cb6717907d653ea674fa1aacc61f3f Mon Sep 17 00:00:00 2001 From: boyce Date: Fri, 13 Apr 2018 14:02:12 +0800 Subject: [PATCH 1/2] #CHG#the old code will formt error in multi thread --- DateTools/DateTools/NSDate+DateTools.m | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/DateTools/DateTools/NSDate+DateTools.m b/DateTools/DateTools/NSDate+DateTools.m index 63d16a85..7327e5b0 100644 --- a/DateTools/DateTools/NSDate+DateTools.m +++ b/DateTools/DateTools/NSDate+DateTools.m @@ -1677,12 +1677,8 @@ -(NSString *)formattedDateWithFormat:(NSString *)format locale:(NSLocale *)local * @return NSString representing the formatted date string */ -(NSString *)formattedDateWithFormat:(NSString *)format timeZone:(NSTimeZone *)timeZone locale:(NSLocale *)locale{ - static NSDateFormatter *formatter = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - formatter = [[NSDateFormatter alloc] init]; - }); - + + NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; [formatter setDateFormat:format]; [formatter setTimeZone:timeZone]; [formatter setLocale:locale]; From 7b162154b1d4e0d09d672e220129bce2cc77cad1 Mon Sep 17 00:00:00 2001 From: boyce Date: Fri, 13 Apr 2018 14:03:59 +0800 Subject: [PATCH 2/2] #CHG#fix leave errors --- DateTools/DateTools/NSDate+DateTools.m | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/DateTools/DateTools/NSDate+DateTools.m b/DateTools/DateTools/NSDate+DateTools.m index 7327e5b0..35203204 100644 --- a/DateTools/DateTools/NSDate+DateTools.m +++ b/DateTools/DateTools/NSDate+DateTools.m @@ -813,12 +813,8 @@ + (NSDate *)dateWithString:(NSString *)dateString formatString:(NSString *)forma + (NSDate *)dateWithString:(NSString *)dateString formatString:(NSString *)formatString timeZone:(NSTimeZone *)timeZone { - static NSDateFormatter *parser = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - parser = [[NSDateFormatter alloc] init]; - }); - + + NSDateFormatter *parser = [[NSDateFormatter alloc] init]; parser.dateStyle = NSDateFormatterNoStyle; parser.timeStyle = NSDateFormatterNoStyle; parser.timeZone = timeZone; @@ -1619,12 +1615,8 @@ -(NSString *)formattedDateWithStyle:(NSDateFormatterStyle)style locale:(NSLocale * @return NSString representing the formatted date string */ -(NSString *)formattedDateWithStyle:(NSDateFormatterStyle)style timeZone:(NSTimeZone *)timeZone locale:(NSLocale *)locale{ - static NSDateFormatter *formatter = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - formatter = [[NSDateFormatter alloc] init]; - }); - + + NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; [formatter setDateStyle:style]; [formatter setTimeZone:timeZone]; [formatter setLocale:locale];