Changeset 12448

Timestamp:

02/11/10 12:16:51 (13 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:

• Pathname.java (modified) (1 diff)
• ZipCache.java (modified) (2 diffs)
• delete_file.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Pathname.java

@@ -1897 +1897 @@
                 if (Utilities.isPlatformWindows) {
                     if (destination.isFile()) {
+      ZipCache.remove(destination);
                         destination.delete();
                     }

trunk/abcl/src/org/armedbear/lisp/ZipCache.java

@@ -167 +167 @@
     public LispObject execute(LispObject arg) {
       Pathname p = coerceToPathname(arg);
-      URL url = Pathname.makeURL(p);
-      boolean result = ZipCache.remove(url);
+      boolean result = ZipCache.remove(p);
       return result ? T : NIL;
     }
   }
       
-
   public static boolean remove(URL url) {
     Entry entry = zipCache.get(url);
@@ -185 +183 @@
     return false;
   }
+
+  public static boolean remove(Pathname p) {
+    URL url = Pathname.makeURL(p);
+    if (url == null) {
+      return false;
+    }
+    return ZipCache.remove(url);
   }
+
+  public static boolean remove(File f) {
+    Pathname p = Pathname.makePathname(f);
+    return ZipCache.remove(p);
+  }
+    
+}

trunk/abcl/src/org/armedbear/lisp/delete_file.java

@@ -69 +69 @@
                                         defaultedPathname));
         final File file = new File(namestring);
+  ZipCache.remove(file);
         if (file.exists()) {
             // File exists.