[armedbear-cvs] r11762 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Fri Apr 17 16:00:18 2009
New Revision: 11762

Log:
Fix JCLASS null return value; signal a lisp error instead.

Found by: Russell McManus (russel_mcmanus at yahoo com)


Modified:
   trunk/abcl/src/org/armedbear/lisp/Java.java

Modified: trunk/abcl/src/org/armedbear/lisp/Java.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Java.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Java.java	Fri Apr 17 16:00:18 2009
@@ -851,7 +851,11 @@
             if (s.equals("double"))
                 return Double.TYPE;
             // Not a primitive Java type.
-            return classForName(s);
+            Class c = classForName(s);
+            if (c == null)
+                error(new LispError(s + " does not designate a Java class."));
+
+            return c;
         }
         // It's not a string, so it must be a JavaObject.
         final JavaObject javaObject;