make == fail on non-numbers

2 files changed, 2 insertions, 3 deletions

diff --git a/src/jvm/clojure/lang/Numbers.java b/src/jvm/clojure/lang/Numbers.java
index bd4a5150..d1d4d90c 100644
--- a/src/jvm/clojure/lang/Numbers.java
+++ b/src/jvm/clojure/lang/Numbers.java
@@ -179,8 +179,7 @@ static Number remainder(double n, double d){
 }
 
 static public boolean equiv(Object x, Object y){
-	return y instanceof Number && x instanceof Number
-	       && equiv((Number) x, (Number) y);
+	return equiv((Number) x, (Number) y);
 }
 
 static public boolean equiv(Number x, Number y){
diff --git a/src/jvm/clojure/lang/Util.java b/src/jvm/clojure/lang/Util.java
index 16f850bb..0070264c 100644
--- a/src/jvm/clojure/lang/Util.java
+++ b/src/jvm/clojure/lang/Util.java
@@ -20,7 +20,7 @@ static public boolean equiv(Object k1, Object k2){
 		return true;
 	if(k1 != null)
 		{
-		if(k1 instanceof Number)
+		if(k1 instanceof Number && k2 instanceof Number)
 			return Numbers.equiv(k1, k2);
 		else if(k1 instanceof IPersistentCollection && k2 instanceof IPersistentCollection)
 			return ((IPersistentCollection)k1).equiv(k2);