Skip to content

Commit 94fcd28

Browse files
Merge pull request #1443 from philfi/main
Remove manual task clearing in URLSessionClient invalidate
2 parents ee7e47c + 20e69d2 commit 94fcd28

1 file changed

Lines changed: 4 additions & 18 deletions

File tree

Sources/Apollo/URLSessionClient.swift

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,29 +65,15 @@ open class URLSessionClient: NSObject, URLSessionDelegate, URLSessionTaskDelegat
6565
self.session = nil
6666
self.clearAllTasks()
6767
}
68-
68+
6969
guard let session = self.session else {
7070
// Session's already gone, just cleanup.
7171
cleanup()
7272
return
7373
}
74-
75-
let currentTaskIDs = self.tasks.value.keys
76-
if #available(OSX 10.11, iOS 9.0, *) {
77-
session.getAllTasks { [weak self] tasks in
78-
for task in tasks {
79-
if currentTaskIDs.contains(task.taskIdentifier) {
80-
self?.cancel(task: task)
81-
}
82-
}
83-
84-
cleanup()
85-
}
86-
} else {
87-
// Fallback on earlier versions - note that per docs this does *not* cancel all operations on the shared session.
88-
session.invalidateAndCancel()
89-
cleanup()
90-
}
74+
75+
session.invalidateAndCancel()
76+
cleanup()
9177
}
9278

9379
/// Clears underlying dictionaries of any data related to a particular task identifier.

0 commit comments

Comments
 (0)