[Author: dmaclach]

Clean up leak in GTMAbstractDOListenerTest and add guard against similar
leaks to GTMAbstractDOListener.

R=thomasvl
DELTA=15  (6 added, 0 deleted, 9 changed)

2 files changed, 16 insertions, 10 deletions

diff --git a/Foundation/GTMAbstractDOListener.m b/Foundation/GTMAbstractDOListener.m
index c77d0a6..cf24c77 100644
--- a/Foundation/GTMAbstractDOListener.m
+++ b/Foundation/GTMAbstractDOListener.m
@@ -253,7 +253,9 @@ static NSMutableSet *gAllListeners = nil;
   BOOL result = NO;
 
   NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
+  
+  _GTMDevAssert(!connection_, @"Connection_ should not be set. Was this "
+                @"listener already started? %@");
   connection_ = [[NSConnection alloc] initWithReceivePort:port_ sendPort:nil];
 
   NSProtocolChecker *checker =
diff --git a/Foundation/GTMAbstractDOListenerTest.m b/Foundation/GTMAbstractDOListenerTest.m
index 56e5a31..895af4a 100644
--- a/Foundation/GTMAbstractDOListenerTest.m
+++ b/Foundation/GTMAbstractDOListenerTest.m
@@ -250,23 +250,27 @@ enum {
 
 - (void)testAbstractDOListenerMultipleRegistration {
   TestServer *listener =
-    [[TestServer alloc] initWithRegisteredName:@"MyUniqueName"
-                                      protocol:@protocol(TestServerDOProtocol)
-                                          port:[NSMachPort port]];
+    [[[TestServer alloc] initWithRegisteredName:@"MyUniqueName"
+                                       protocol:@protocol(TestServerDOProtocol)
+                                           port:[NSMachPort port]] autorelease];
   [GTMUnitTestDevLog expectPattern:@"listening on.*"];
   [listener runInCurrentThread];
 
   TestServer *copyCat =
-  [[TestServer alloc] initWithRegisteredName:@"copyCat"
-                                    protocol:@protocol(TestServerDOProtocol)
-                                        port:[NSMachPort port]];
+    [[[TestServer alloc] initWithRegisteredName:@"copyCat"
+                                       protocol:@protocol(TestServerDOProtocol)
+                                           port:[NSMachPort port]] autorelease];
   STAssertTrue(([[copyCat registeredName] isEqualToString:@"copyCat"]),
                @"The name we set to register with is not correct.");
 
-  [listener setRegisteredName:@"MyUniqueName"];
+  TestServer *listener2 =
+    [[[TestServer alloc] initWithRegisteredName:@"MyUniqueName"
+                                       protocol:@protocol(TestServerDOProtocol)
+                                           port:[NSMachPort port]] autorelease];
+  
   [GTMUnitTestDevLog expectPattern:@"failed to register.*"];
-  [listener runInCurrentThread];
-  STAssertNil([listener connection], @"We should not have been able to created "
+  [listener2 runInCurrentThread];
+  STAssertNil([listener2 connection], @"We should not have been able to create "
               @"a server with a name that has already been taken.");
 }