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

[Erik Huelsmann]

Author: ehuelsmann
Date: Sun Feb 14 14:41:20 2010
New Revision: 12478

Log:
loadCompiledFunction is deprecated, so rewrite to eliminate its use.

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

Modified: trunk/abcl/src/org/armedbear/lisp/AutoloadedFunctionProxy.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/AutoloadedFunctionProxy.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/AutoloadedFunctionProxy.java	Sun Feb 14 14:41:20 2010
@@ -219,8 +219,10 @@
       LispThread thread = LispThread.currentThread();
       LispObject value = AUTOLOADING_CACHE.symbolValue(thread);
 
-      if (value instanceof Nil)
-          return loadCompiledFunction(name);
+      if (value instanceof Nil) {
+          byte[] bytes = readFunctionBytes(new Pathname(name));
+          return (bytes == null) ? null : loadClassBytes(bytes);
+      }
 
       Hashtable cache = (Hashtable)value.javaInstance();
       byte[] bytes = (byte[])cache.get(name);