Permalink
Browse files

Merge remote-tracking branch 'sequelpro/master'

  • Loading branch information...
abhibeckert committed Mar 10, 2017
2 parents 833d872 + cbfadab commit c866a5bbfc741eed3883d6f7eccbaeae7c744970
@@ -81,8 +81,10 @@ - (void)_keepAlive
*/
- (void)_threadedKeepAlive
{
if(keepAliveThread) {
NSLog(@"warning: overwriting existing keepAliveThread: %@, results may be unpredictable!",keepAliveThread);
@synchronized(self) {
if(keepAliveThread) {
NSLog(@"warning: overwriting existing keepAliveThread: %@, results may be unpredictable!",keepAliveThread);
}
}
keepAliveThread = [NSThread currentThread];
@@ -114,7 +116,9 @@ - (void)_threadedKeepAlive
keepAlivePingFailures++;
}
end_cleanup:
keepAliveThread = nil;
@synchronized(self) {
keepAliveThread = nil;
}
}
#pragma mark -

0 comments on commit c866a5b

Please sign in to comment.