Skip to content

fix block may not be called #78

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix block may not be called #78

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 28 additions & 4 deletions TMCache/TMCache.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,14 @@ + (instancetype)sharedCache

- (void)objectForKey:(NSString *)key block:(TMCacheObjectBlock)block
{
if (!key || !block)
if (!key || !block) {
if (block) {
dispatch_async(_queue, ^{
block(self, key, nil);
});
}
return;
}

__weak TMCache *weakSelf = self;

Expand Down Expand Up @@ -120,8 +126,14 @@ - (void)objectForKey:(NSString *)key block:(TMCacheObjectBlock)block

- (void)setObject:(id <NSCoding>)object forKey:(NSString *)key block:(TMCacheObjectBlock)block
{
if (!key || !object)
if (!key || !object) {
if (block) {
dispatch_async(_queue, ^{
block(self, key, nil);
});
}
return;
}

dispatch_group_t group = nil;
TMMemoryCacheObjectBlock memBlock = nil;
Expand Down Expand Up @@ -160,8 +172,14 @@ - (void)setObject:(id <NSCoding>)object forKey:(NSString *)key block:(TMCacheObj

- (void)removeObjectForKey:(NSString *)key block:(TMCacheObjectBlock)block
{
if (!key)
if (!key) {
if (block) {
dispatch_async(_queue, ^{
block(self, key, nil);
});
}
return;
}

dispatch_group_t group = nil;
TMMemoryCacheObjectBlock memBlock = nil;
Expand Down Expand Up @@ -237,8 +255,14 @@ - (void)removeAllObjects:(TMCacheBlock)block

- (void)trimToDate:(NSDate *)date block:(TMCacheBlock)block
{
if (!date)
if (!date) {
if (block) {
dispatch_async(_queue, ^{
block(self);
});
}
return;
}

dispatch_group_t group = nil;
TMMemoryCacheBlock memBlock = nil;
Expand Down