Merge pull request #75 from NoahTheDuke/nb/fix-set-npe

Fast-follow to #74 Fix NPE in ordered sets
clj-commons · May 10, 2024 · 574e470 · 574e470
2 parents b4277db + 05952c3
commit 574e470
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/flatland/ordered/set.clj b/src/flatland/ordered/set.clj
@@ -56,7 +56,7 @@
   (toString [this]
     (str "#{" (clojure.string/join " " (map str this)) "}"))
   (hashCode [this]
-    (reduce + (keep #(when % (.hashCode ^Object %)) (.seq this))))
+    (reduce + (keep #(when (some? %) (.hashCode ^Object %)) (.seq this))))
   (equals [this other]
     (or (identical? this other)
         (and (instance? Set other)

diff --git a/test/flatland/ordered/set_test.clj b/test/flatland/ordered/set_test.clj
@@ -165,6 +165,11 @@
     (is (= (.hashCode (ordered-set nil)) (.hashCode (hash-set nil))))
     (is (= (.hashCode (ordered-set nil :a {:b nil})) (.hashCode (hash-set nil :a {:b nil}))))))
 
+(deftest nil-and-false-hashes
+  (is (not= (.hashCode (ordered-set nil)) (.hashCode (hash-set false))))
+  (is (not= (.hashCode (ordered-set false)) (.hashCode (hash-set nil))))
+  (is (= (.hashCode (ordered-set false nil)) (.hashCode (hash-set nil false)))))
+
 (deftest nil-hash-code-npe
   ;; No assertions here; just check that it doesn't NPE
   ;; See: https://github.com/amalloy/ordered/issues/27