CLJ-1242: equals doesn't throw on sorted collections

Signed-off-by: Stuart Halloway <[email protected]>

Author: bronsa

src/jvm/clojure/lang/PersistentTreeMap.java

@@ -94,6 +94,22 @@ public boolean containsKey(Object key){
 	return entryAt(key) != null;
 }
 
+public boolean equals(Object obj){
+    try {
+        return super.equals(obj);
+    } catch (ClassCastException e) {
+        return false;
+    }
+}
+
+public boolean equiv(Object obj){
+    try {
+        return super.equiv(obj);
+    } catch (ClassCastException e) {
+        return false;
+    }
+}
+
 public PersistentTreeMap assocEx(Object key, Object val) {
 	Box found = new Box(null);
 	Node t = add(tree, key, val, found);

src/jvm/clojure/lang/PersistentTreeSet.java

@@ -42,6 +42,22 @@ static public PersistentTreeSet create(Comparator comp, ISeq items){
 	this._meta = meta;
 }
 
+public boolean equals(Object obj){
+    try {
+        return super.equals(obj);
+    } catch (ClassCastException e) {
+        return false;
+    }
+}
+
+public boolean equiv(Object obj){
+    try {
+        return super.equiv(obj);
+    } catch (ClassCastException e) {
+        return false;
+    }
+}
+
 public IPersistentSet disjoin(Object key) {
 	if(contains(key))
 		return new PersistentTreeSet(meta(),impl.without(key));

test/clojure/test_clojure/data_structures.clj

@@ -202,6 +202,8 @@
       (hash-map   :a 1 :b 2)
       (array-map  :a 1 :b 2))
 
+  (is (not= (sorted-set :a) (sorted-set 1)))
+
   ; sorted-set vs. hash-set
   (is (not= (class (sorted-set 1)) (class (hash-set 1))))
   (are [x y] (= x y)