Merge remote-tracking branch 'sequelpro/master'

abhibeckert · abhibeckert · commit c866a5bbfc74 · 2017-03-10T13:12:14.000+10:00
diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Ping & KeepAlive.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Ping & KeepAlive.m
@@ -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 -

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,10 @@ - (void)_keepAlive`
`81`	`81`	`*/`
`82`	`82`	`- (void)_threadedKeepAlive`
`83`	`83`	`{`
`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`	`+ }`
`86`	`88`	`}`
`87`	`89`
`88`	`90`	`keepAliveThread = [NSThread currentThread];`
`@@ -114,7 +116,9 @@ - (void)_threadedKeepAlive`
`114`	`116`	`keepAlivePingFailures++;`
`115`	`117`	`}`
`116`	`118`	`end_cleanup:`
`117`		`- keepAliveThread = nil;`
	`119`	`+ @synchronized(self) {`
	`120`	`+ keepAliveThread = nil;`
	`121`	`+ }`
`118`	`122`	`}`
`119`	`123`
`120`	`124`	`#pragma mark -`