Futures guard against nil arguments.

robrix · Feb 13, 2012 · b102c9d · b102c9d
1 parent f83ef69
commit b102c9d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/RXFutures/RXFuture.h b/RXFutures/RXFuture.h
@@ -13,6 +13,8 @@
 	dispatch_queue_t queue;
 }
 
++(RXFuture *)future;
+
 -(void)onComplete:(void(^)())block;
 -(void)complete;
 -(void)complete:(void(^)())block; // shorthand for -onComplete: followed by -complete

diff --git a/RXFutures/RXFuture.m b/RXFutures/RXFuture.m
@@ -15,6 +15,12 @@ @implementation RXFuture
 
 @synthesize cancelled, completed;
 
+
++(RXFuture *)future {
+	return [[self new] autorelease];
+}
+
+
 -(id)init {
 	if((self = [super init])) {
 		completionHandlers = [NSMutableSet new];
@@ -38,12 +44,13 @@ -(void)dispatchCallback:(void(^)())block {
 
 
 -(void)onCancel:(void(^)())block {
-	[self performBlock:^{
+	if(block)
-		if(cancelled)
+		[self performBlock:^{
-			[self dispatchCallback:block];
+			if(cancelled)
-		else
+				[self dispatchCallback:block];
-			[cancellationHandlers addObject:block];
+			else
-	}];
+				[cancellationHandlers addObject:block];
+		}];
 }
 
 -(void)cancel {
@@ -64,12 +71,13 @@ -(void)cancel:(void(^)())block {
 
 
 -(void)onComplete:(void(^)())block {
-	[self performBlock:^{
+	if(block)
-		if(completed)
+		[self performBlock:^{
-			[self dispatchCallback:block];
+			if(completed)
-		else
+				[self dispatchCallback:block];
-			[completionHandlers addObject:block];
+			else
-	}];
+				[completionHandlers addObject:block];
+		}];
 }
 
 -(void)complete {
@@ -102,7 +110,8 @@ -(void)unlessCancelled:(void(^)())block {
 
 
 -(void)cascadeCancellationToFuture:(RXFuture *)future {
-	[self onCancel:^{ [future cancel]; }];
+	if(future)
+		[self onCancel:^{ [future cancel]; }];
 }
 
 @end