Correct an issue with false positive key loading

whitfin · Apr 9, 2016 · 81dc6aa · 81dc6aa
1 parent 9738c81
commit 81dc6aa
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 33 deletions.
diff --git a/lib/cachex/worker/local.ex b/lib/cachex/worker/local.ex
@@ -36,17 +36,12 @@ defmodule Cachex.Worker.Local do
 
     case val do
       :missing ->
-        { status, new_value } =
-          result =
-            state
-            |> Util.get_fallback(key, fb_fun)
-
-        state
-        |> Worker.set(key, new_value)
-
-        case status do
-          :ok -> { :missing, new_value }
-          :loaded -> result
+        case Util.get_fallback(state, key, fb_fun) do
+          { :ok, new_value } ->
+            { :missing, new_value }
+          { :loaded, new_value } = result ->
+            Worker.set(state, key, new_value)
+            result
         end
       val ->
         { :ok, val }

diff --git a/lib/cachex/worker/remote.ex b/lib/cachex/worker/remote.ex
@@ -36,17 +36,12 @@ defmodule Cachex.Worker.Remote do
 
     case val do
       :missing ->
-        { status, new_value } =
-          result =
-            state
-            |> Util.get_fallback(key, fb_fun)
-
-        state
-        |> Worker.set(key, new_value)
-
-        case status do
-          :ok -> { :missing, new_value }
-          :loaded -> result
+        case Util.get_fallback(state, key, fb_fun) do
+          { :ok, new_value } ->
+            { :missing, new_value }
+          { :loaded, new_value } = result ->
+            Worker.set(state, key, new_value)
+            result
         end
       val ->
         { :ok, val }

diff --git a/lib/cachex/worker/transactional.ex b/lib/cachex/worker/transactional.ex
@@ -35,17 +35,12 @@ defmodule Cachex.Worker.Transactional do
 
       case val do
         :missing ->
-          { status, new_value } =
-            result =
-              state
-              |> Util.get_fallback(key, fb_fun)
-
-          state
-          |> Worker.set(key, new_value)
-
-          case status do
-            :ok -> { :missing, new_value }
-            :loaded -> result
+          case Util.get_fallback(state, key, fb_fun) do
+            { :ok, new_value } ->
+              { :missing, new_value }
+            { :loaded, new_value } = result ->
+              Worker.set(state, key, new_value)
+              result
           end
         val ->
           { :ok, val }