CCACHE-1: Guarding lookup with has? check

clojure · Nov 29, 2011 · 7f77aee · 7f77aee
1 parent dbede28
commit 7f77aee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/clojure/clojure/core/cache.clj b/src/main/clojure/clojure/core/cache.clj
@@ -43,8 +43,8 @@
      (valAt [this# key#]
        (lookup this# key#))
      (valAt [this# key# not-found#]
-       (if-let [res# (lookup this# key#)]
+       (if (has? this# key#)
-         res#
+         (lookup this# key#)
          not-found#))
 
      clojure.lang.IPersistentMap

diff --git a/src/test/clojure/clojure/core/cache/tests.clj b/src/test/clojure/clojure/core/cache/tests.clj
@@ -34,7 +34,7 @@
        (get c :e) nil
        (get c :e 0) 0
        (get c :b 0) 2
-;;       (get c :f 0) nil
+       (get c :f 0) nil
 
        (get-in c [:c :e]) 4
        (get-in c '(:c :e)) 4
@@ -49,8 +49,8 @@
        (get-in c '(:c :e) 0) 4
        (get-in c [:c :x] 0) 0
        (get-in c [:b] 0) 2
-;;       (get-in c [:f] 0) nil
+       (get-in c [:f] 0) nil
-;;       (get-in c [:g] 0) false
+       (get-in c [:g] 0) false
        (get-in c [:h] 0) 0
        (get-in c [:x :y] {:y 1}) {:y 1}
        (get-in c [] 0) c