Modify our current implementation of all singleton instances to be inline with Apple's recommendations detailed at http://developer.apple.com/mac/library/documentation/Cocoa/Conceptual/CocoaFundamentals/CocoaObjects/CocoaObjects.html#//apple_ref/doc/uid/TP40002974-CH4-SW32 This also fixes the associated static analysis warnings of potentially leaked objects.

1 files changed, 12 insertions, 8 deletions

diff --git a/Source/SPLogger.m b/Source/SPLogger.m
index 9d8f7a92..d492fe32 100644
--- a/Source/SPLogger.m
+++ b/Source/SPLogger.m
@@ -47,7 +47,7 @@ static SPLogger *logger = nil;
 {
 	@synchronized(self) {
 		if (logger == nil) {
-			[[self alloc] init];
+			logger = [[super allocWithZone:NULL] init];
 		}
 	}
 	
@@ -60,16 +60,20 @@ static SPLogger *logger = nil;
 + (id)allocWithZone:(NSZone *)zone
 {    
     @synchronized(self) {
-        if (logger == nil) {
-            logger = [super allocWithZone:zone];
-            
-            return logger;
-        }
+		return [[self logger] retain];
     }
-    
-    return nil;
 }
 
+- (id)copyWithZone:(NSZone *)zone { return self; }
+
+- (id)retain { return self; }
+
+- (NSUInteger)retainCount { return NSUIntegerMax; }
+
+- (void)release {}
+
+- (id)autorelease { return self; }
+
 - (id)init
 {
 	if ((self = [super init])) {