Skip to content

Commit c866a5b

Browse files
committed
Merge remote-tracking branch 'sequelpro/master'
2 parents 833d872 + cbfadab commit c866a5b

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Ping & KeepAlive.m

+7-3
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,10 @@ - (void)_keepAlive
8181
*/
8282
- (void)_threadedKeepAlive
8383
{
84-
if(keepAliveThread) {
85-
NSLog(@"warning: overwriting existing keepAliveThread: %@, results may be unpredictable!",keepAliveThread);
84+
@synchronized(self) {
85+
if(keepAliveThread) {
86+
NSLog(@"warning: overwriting existing keepAliveThread: %@, results may be unpredictable!",keepAliveThread);
87+
}
8688
}
8789

8890
keepAliveThread = [NSThread currentThread];
@@ -114,7 +116,9 @@ - (void)_threadedKeepAlive
114116
keepAlivePingFailures++;
115117
}
116118
end_cleanup:
117-
keepAliveThread = nil;
119+
@synchronized(self) {
120+
keepAliveThread = nil;
121+
}
118122
}
119123

120124
#pragma mark -

0 commit comments

Comments
 (0)