Fixed memory leak in MWCocoaEvent

mworks-project · Jun 22, 2010 · 5a7645d · 5a7645d
1 parent c48e63d
commit 5a7645d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/Source/MWCocoaEvent.m b/Source/MWCocoaEvent.m
@@ -23,10 +23,19 @@ - (id) initWithData:(Datum *)data
 	return self;
 }
 
+- (void)dealloc {
+    delete _data;
+    [super dealloc];
+}
+
+// finalize is called instead of dealloc when garbage collection is enabled.  Since we don't currently
+// support GC, there's no need for this.
+/*
 - (void)finalize {
     delete _data;
     [super finalize];
 }
+*/
 
 - (MWorksTime)time {
 	return _time;

diff --git a/Source/MWCocoaEventFunctor.h b/Source/MWCocoaEventFunctor.h
@@ -57,9 +57,9 @@ namespace mw {
 				NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
 				Datum data(event->getData());
-				id cocoaEvent = [[[MWCocoaEvent alloc] initWithData:&data 
-															andCode:event->getEventCode() 
-															andTime:event->getTime()] autorelease];
+				MWCocoaEvent *cocoaEvent = [[MWCocoaEvent alloc] initWithData:&data 
+                                                                      andCode:event->getEventCode() 
+                                                                      andTime:event->getTime()];
 
         //@synchronized(syncobject){
           if([receiver respondsToSelector:selector]) {
@@ -79,7 +79,8 @@ namespace mw {
             merror(M_CLIENT_MESSAGE_DOMAIN, [[errorMessage stringByAppendingString:sn] cStringUsingEncoding:NSASCIIStringEncoding]);
           }
         //}
-				[pool release];
+                [cocoaEvent release];
+				[pool drain];
 			};         
 		};