Skip to content

Hotfix/fix multi thread error #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
boycehe wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Hotfix/fix multi thread error #258

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30bb10a
#CHG#the old code will formt error in multi thread
boycehe Apr 13, 2018
7b16215
#CHG#fix leave errors
boycehe Apr 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 6 additions & 18 deletions DateTools/DateTools/NSDate+DateTools.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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];
Expand Down Expand Up @@ -1677,12 +1669,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];
Expand Down