Retry task only if task is not cancelled.

kevin-lyn · kevin-lyn · commit 2e38c9f3de05 · 2015-12-04T14:19:57.000+08:00
diff --git a/STNetTaskQueue/STNetTaskQueue.m b/STNetTaskQueue/STNetTaskQueue.m
@@ -125,8 +125,10 @@ - (BOOL)_retryTask:(STNetTask *)task withError:(NSError *)error
 
 - (void)_retryTask:(STNetTask *)task
 {
-    [task didRetry];
-    [self addTask:task];
+    if (!task.cancelled) {
+        [task didRetry];
+        [self addTask:task];
+    }
 }
 
 - (void)_sendWatingTasks
diff --git a/STNetTaskQueueTest/STNetTaskQueueTest/STNetTaskQueueTestHTTP.m b/STNetTaskQueueTest/STNetTaskQueueTest/STNetTaskQueueTestHTTP.m
@@ -60,7 +60,7 @@ - (void)testCancelNetTask
 {
     [self setUpNetTaskQueueWithBaseURLString:@"http://jsonplaceholder.typicode.com"];
     
-    _expectation = [self expectationWithDescription:@"testRetryNetTask"];
+    _expectation = [self expectationWithDescription:@"testCancelNetTask"];
     
     STTestRetryNetTask *testRetryTask = [STTestRetryNetTask new];
     [[STNetTaskQueue sharedQueue] addTaskDelegate:self uri:testRetryTask.uri];

Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,10 @@ - (BOOL)_retryTask:(STNetTask )task withError:(NSError )error`
`125`	`125`
`126`	`126`	`- (void)_retryTask:(STNetTask *)task`
`127`	`127`	`{`
`128`		`- [task didRetry];`
`129`		`- [self addTask:task];`
	`128`	`+ if (!task.cancelled) {`
	`129`	`+ [task didRetry];`
	`130`	`+ [self addTask:task];`
	`131`	`+ }`
`130`	`132`	`}`
`131`	`133`
`132`	`134`	`- (void)_sendWatingTasks`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ - (void)testCancelNetTask`
`60`	`60`	`{`
`61`	`61`	`[self setUpNetTaskQueueWithBaseURLString:@"http://jsonplaceholder.typicode.com"];`
`62`	`62`
`63`		`- _expectation = [self expectationWithDescription:@"testRetryNetTask"];`
	`63`	`+ _expectation = [self expectationWithDescription:@"testCancelNetTask"];`
`64`	`64`
`65`	`65`	`STTestRetryNetTask *testRetryTask = [STTestRetryNetTask new];`
`66`	`66`	`[[STNetTaskQueue sharedQueue] addTaskDelegate:self uri:testRetryTask.uri];`