Changeset 12448


Ignore:
Timestamp:
02/11/10 12:16:51 (11 years ago)
Author:
Mark Evenson
Message:

Remove potentially present ZipCache? files entries on DELETE-FILE and RENAME-FILE.

Corrects failing COMPILE-FILE.* ANSI-TESTs under Windows.

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/Pathname.java

    r12441 r12448  
    18971897                if (Utilities.isPlatformWindows) {
    18981898                    if (destination.isFile()) {
     1899      ZipCache.remove(destination);
    18991900                        destination.delete();
    19001901                    }
  • trunk/abcl/src/org/armedbear/lisp/ZipCache.java

    r12446 r12448  
    167167    public LispObject execute(LispObject arg) {
    168168      Pathname p = coerceToPathname(arg);
    169       URL url = Pathname.makeURL(p);
    170       boolean result = ZipCache.remove(url);
     169      boolean result = ZipCache.remove(p);
    171170      return result ? T : NIL;
    172171    }
    173172  }
    174173     
    175 
    176174  public static boolean remove(URL url) {
    177175    Entry entry = zipCache.get(url);
     
    185183    return false;
    186184  }
     185
     186  public static boolean remove(Pathname p) {
     187    URL url = Pathname.makeURL(p);
     188    if (url == null) {
     189      return false;
     190    }
     191    return ZipCache.remove(url);
    187192  }
     193
     194  public static boolean remove(File f) {
     195    Pathname p = Pathname.makePathname(f);
     196    return ZipCache.remove(p);
     197  }
     198   
     199}
  • trunk/abcl/src/org/armedbear/lisp/delete_file.java

    r12431 r12448  
    6969                                        defaultedPathname));
    7070        final File file = new File(namestring);
     71  ZipCache.remove(file);
    7172        if (file.exists()) {
    7273            // File exists.
Note: See TracChangeset for help on using the changeset viewer.