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

[Erik Huelsmann]

Author: ehuelsmann
Date: Sun Apr 25 03:06:04 2010
New Revision: 12635

Log:
Fix loading of stale fasls.

Patch by: David Kirkman  dkirkman at ucsd dot edu


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

Modified: trunk/abcl/src/org/armedbear/lisp/Load.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Load.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Load.java	Sun Apr 25 03:06:04 2010
@@ -84,14 +84,14 @@
             abclPathname.invalidateNamestring();
             LispObject abcl = Pathname.truename(abclPathname, false);
             if (lisp instanceof Pathname && abcl instanceof Pathname) {
-                lispPathname = (Pathname)lisp;
-                abclPathname = (Pathname)abcl;
-                long lispLastModified = lispPathname.getLastModified();
-                long abclLastModified = abclPathname.getLastModified();
+              lispPathname = (Pathname)lisp;
+              abclPathname = (Pathname)abcl;
+              long lispLastModified = lispPathname.getLastModified();
+              long abclLastModified = abclPathname.getLastModified();
               if (abclLastModified > lispLastModified) {
-                  return lispPathname;
+                  return abclPathname;  // fasl file is newer
               } else {
-                  return abclPathname;
+                  return lispPathname;
               }
             } else if (abcl instanceof Pathname) {
                 return (Pathname) abcl;