Merge pull request onevcat#790 from onevcat/fix/thread-racing

Resolve a reading racing condition
dowjones-mobile · Oct 17, 2017 · 32304cc · 32304cc
2 parents fb05558 + 091c3ce
commit 32304cc
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/Sources/ImageDownloader.swift b/Sources/ImageDownloader.swift
@@ -412,13 +412,6 @@ extension ImageDownloader {
             }
         }
     }
-
-    func clean(for url: URL) {
-        barrierQueue.sync(flags: .barrier) {
-            fetchLoads.removeValue(forKey: url)
-            return
-        }
-    }
 }
 
 // MARK: - NSURLSessionDataDelegate
@@ -510,11 +503,12 @@ class ImageDownloaderSessionHandler: NSObject, URLSessionDataDelegate, Authentic
         guard let downloader = downloadHolder else {
             return
         }
-
-        downloader.clean(for: url)
-
-        if downloader.fetchLoads.isEmpty {
-            downloadHolder = nil
+
+        downloader.barrierQueue.sync(flags: .barrier) {
+            downloader.fetchLoads.removeValue(forKey: url)
+            if downloader.fetchLoads.isEmpty {
+                downloadHolder = nil
+            }
         }
     }