- Fix NSLock console lines

 - Speed up table content processing a bit
 - Make the table content download/processing determinate where an approximate row count is available
 - Clean up table content source, assuming MCPStreamingResult will remain in use

1 files changed, 5 insertions, 2 deletions

diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPStreamingResult.m b/Frameworks/MCPKit/MCPFoundationKit/MCPStreamingResult.m
index e51785f8..3f3e2073 100644
--- a/Frameworks/MCPKit/MCPFoundationKit/MCPStreamingResult.m
+++ b/Frameworks/MCPKit/MCPFoundationKit/MCPStreamingResult.m
@@ -74,6 +74,7 @@
 		mTimeZone = [theTimeZone retain];
 		parentConnection = theConnection;
 		fullyStreaming = useFullStreaming;
+		connectionUnlocked = NO;
 
 		if (mResult) {
 			mysql_free_result(mResult);
@@ -122,9 +123,9 @@
 /**
  * Deallocate the result and unlock the parent connection for further use
  */
-	- (void) dealloc
+- (void) dealloc
 {
-	[parentConnection unlockConnection];
+	if (!connectionUnlocked) [parentConnection unlockConnection];
 
 	[super dealloc];
 }
@@ -169,6 +170,8 @@
 		// once all memory has been freed
 		if (processedRowCount == downloadedRowCount) {
 			while (!dataFreed) usleep(1000);
+			[parentConnection unlockConnection];
+			connectionUnlocked = YES;
 			return nil;
 		}