adium 4183:a7f63382975e: Deloggify

commits at adium.im commits at adium.im
Mon Aug 29 00:17:37 UTC 2011


details:	http://hg.adium.im/adium/rev/a7f63382975e
revision:	4183:a7f63382975e
branch:		(none)
author:		Evan Schoenberg
date:		Sun Aug 28 19:16:20 2011 -0500

Deloggify
Subject: adium 4184:2fb1b4da6e87: This now indicates a simple leak; quiet it down and move it into our debug logging

details:	http://hg.adium.im/adium/rev/2fb1b4da6e87
revision:	4184:2fb1b4da6e87
branch:		(none)
author:		Evan Schoenberg
date:		Sun Aug 28 19:17:33 2011 -0500

This now indicates a simple leak; quiet it down and move it into our debug logging

diffs (30 lines):

diff -r 7f455d4da163 -r 2fb1b4da6e87 Frameworks/Adium Framework/Source/AIProxyListObject.m
--- a/Frameworks/Adium Framework/Source/AIProxyListObject.m	Sun Aug 28 00:34:56 2011 +0300
+++ b/Frameworks/Adium Framework/Source/AIProxyListObject.m	Sun Aug 28 19:17:33 2011 -0500
@@ -60,10 +60,11 @@
 	proxy = [proxyDict objectForKey:key];
 
 	if (proxy && proxy.listObject != inListObject) {
-        /* This is a cataclysmic memory management failure and should NEVER happen. I leave the logging in for now. -evands 8/7/11 */
-		NSLog(@"Re-used AIProxyListObject (this should not happen.). Key %@ for inListObject %@ -> %p.listObject=%@", key,inListObject,proxy,proxy.listObject);
-		[self releaseProxyObject:proxy];
-		proxy = nil;
+        /* This is a memory management failure; AIContactController stopped tracking a list object, but it never deallocated. -evands 8/7/11 */
+		AILogWithSignature(@"%@ was leaked! Meh.", proxy.listObject);
+
+		proxy.listObject = inListObject;
+		proxy.containingObject = inContainingObject;
 	}
 
 	if (!proxy) {
diff -r 7f455d4da163 -r 2fb1b4da6e87 Source/AILoggerPlugin.m
--- a/Source/AILoggerPlugin.m	Sun Aug 28 00:34:56 2011 +0300
+++ b/Source/AILoggerPlugin.m	Sun Aug 28 19:17:33 2011 -0500
@@ -502,7 +502,6 @@
 
 - (void)cancelIndexing
 {
-	NSLog(@"Canceling..");
 	if (logsToIndex) {
 		__block __typeof__(self) bself = self;
 		dispatch_group_async(loggerPluginGroup, defaultDispatchQueue, ^{




More information about the commits mailing list