introduce closed flag to XHR transport. fix #130.

progeddog · pkyeck · commit 62fc2c6dd1a7 · 2013-11-18T12:27:25.000+01:00
diff --git a/SocketIOTransportXHR.h b/SocketIOTransportXHR.h
@@ -30,8 +30,10 @@
     NSString *_url;
     NSMutableData *_data;
     NSMutableDictionary *_polls;
+    BOOL _isClosed;
 }
 
 @property (nonatomic, unsafe_unretained) id <SocketIOTransportDelegate> delegate;
+@property (nonatomic) BOOL isClosed;
 
 @end
diff --git a/SocketIOTransportXHR.m b/SocketIOTransportXHR.m
@@ -45,7 +45,8 @@ - (void) poll:(NSString *)data retryNumber:(int)retry;
 
 @implementation SocketIOTransportXHR
 
-@synthesize delegate;
+@synthesize delegate,
+            isClosed = _isClosed;
 
 - (id) initWithDelegate:(id<SocketIOTransportDelegate>)delegate_
 {
@@ -83,6 +84,8 @@ - (void) close
         [conn cancel];
     }
     [_polls removeAllObjects];
+    
+    _isClosed = YES;
 }
 
 - (BOOL) isReady
@@ -101,6 +104,10 @@ - (void) send:(NSString *)request
 
 - (void) checkAndStartPoll
 {
+    if (_isClosed) {
+        return;
+    }
+    
     BOOL restart = NO;
     // no polls currently running -> start one
     if ([_polls count] == 0) {

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,10 @@`
`30`	`30`	`NSString *_url;`
`31`	`31`	`NSMutableData *_data;`
`32`	`32`	`NSMutableDictionary *_polls;`
	`33`	`+ BOOL _isClosed;`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`@property (nonatomic, unsafe_unretained) id <SocketIOTransportDelegate> delegate;`
	`37`	`+@property (nonatomic) BOOL isClosed;`
`36`	`38`
`37`	`39`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ - (void) poll:(NSString *)data retryNumber:(int)retry;`
`45`	`45`
`46`	`46`	`@implementation SocketIOTransportXHR`
`47`	`47`
`48`		`-@synthesize delegate;`
	`48`	`+@synthesize delegate,`
	`49`	`+ isClosed = _isClosed;`
`49`	`50`
`50`	`51`	`- (id) initWithDelegate:(id<SocketIOTransportDelegate>)delegate_`
`51`	`52`	`{`
`@@ -83,6 +84,8 @@ - (void) close`
`83`	`84`	`[conn cancel];`
`84`	`85`	`}`
`85`	`86`	`[_polls removeAllObjects];`
	`87`	`+`
	`88`	`+ _isClosed = YES;`
`86`	`89`	`}`
`87`	`90`
`88`	`91`	`- (BOOL) isReady`
`@@ -101,6 +104,10 @@ - (void) send:(NSString *)request`
`101`	`104`
`102`	`105`	`- (void) checkAndStartPoll`
`103`	`106`	`{`
	`107`	`+ if (_isClosed) {`
	`108`	`+ return;`
	`109`	`+ }`
	`110`	`+`
`104`	`111`	`BOOL restart = NO;`
`105`	`112`	`// no polls currently running -> start one`
`106`	`113`	`if ([_polls count] == 0) {`