From 8cea3d8a2b4b4374668d8d24845de74c505d3a3a Mon Sep 17 00:00:00 2001 From: Aaron Bedra Date: Fri, 7 Jan 2011 15:09:01 -0500 Subject: use clojure.lang.Util.classOf() instead of getClass() to avoid NPE in (case nil ... ) inside of constantType. Don't do the work and just return java.lang.Object if class is NULL. Signed-off-by: Stuart Halloway --- src/jvm/clojure/lang/Compiler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java index 4a2deb2c..1fc3aceb 100644 --- a/src/jvm/clojure/lang/Compiler.java +++ b/src/jvm/clojure/lang/Compiler.java @@ -4571,8 +4571,8 @@ static public class ObjExpr implements Expr{ Type constantType(int id){ Object o = constants.nth(id); - Class c = o.getClass(); - if(Modifier.isPublic(c.getModifiers())) + Class c = clojure.lang.Util.classOf(o); + if(c!= null && Modifier.isPublic(c.getModifiers())) { //can't emit derived fn types due to visibility if(LazySeq.class.isAssignableFrom(c)) -- cgit v1.2.3-70-g09d2