Unit test proofs that lazy is not needed, but Task serialization defi…

…nitely is.
fsprojects · Aug 25, 2016 · 44fd4ba · 44fd4ba
1 parent 2d4b05e
commit 44fd4ba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Paket.Core/Utils.fs b/src/Paket.Core/Utils.fs
@@ -31,9 +31,7 @@ let internal memoize (f: 'a -> 'b) : 'a -> 'b =
 let internal memoizeAsync f =
     let cache = System.Collections.Concurrent.ConcurrentDictionary<'a, System.Threading.Tasks.Task<'b>>()
     fun (x: 'a) -> // task.Result serialization to sync after done.
-        cache.GetOrAdd(x, fun x -> // Lazy is needed for "if managed to start multiple before added"
-            let threadfix = lazy( f(x) |> Async.StartAsTask )
-            threadfix.Force()) |> Async.AwaitTask
+        cache.GetOrAdd(x, fun x -> f(x) |> Async.StartAsTask) |> Async.AwaitTask
 
 type Auth = 
     | Credentials of Username : string * Password : string

diff --git a/tests/Paket.Tests/DependenciesFile/ParserSpecs.fs b/tests/Paket.Tests/DependenciesFile/ParserSpecs.fs
@@ -1359,6 +1359,8 @@ let ``async cache should work``() =
         do! memFunc "a" |> Async.Ignore
         do! memFunc "a" |> Async.Ignore
         do! memFunc "a" |> Async.Ignore
+        do! [|1 .. 30|] |> Seq.map(fun _ -> (memFunc "a")) 
+            |> Async.Parallel |> Async.Ignore
         for i = 1 to 30 do
             Async.Start( memFunc "a" |> Async.Ignore )
             Async.Start( memFunc "a" |> Async.Ignore )
@@ -1367,6 +1369,8 @@ let ``async cache should work``() =
         do! memFunc "a" |> Async.Ignore
         for i = 1 to 30 do
             Async.Start( memFunc "a" |> Async.Ignore )
+        do! [|1 .. 30|] |> Seq.map(fun _ -> (memFunc "a")) 
+            |> Async.Parallel |> Async.Ignore
     } |> Async.RunSynchronously
     x |> shouldEqual 1