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

[Mark Evenson]

Author: mevenson
Date: Thu Apr 15 10:27:16 2010
New Revision: 12608

Log:
Don't throw LispError on non existent jar for DIRECTORY.



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

Modified: trunk/abcl/src/org/armedbear/lisp/Pathname.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Pathname.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Pathname.java	Thu Apr 15 10:27:16 2010
@@ -1543,10 +1543,13 @@
             jarPathname.name = NIL;
             jarPathname.type = NIL;
             jarPathname.invalidateNamestring();
-            // will propagate an appropiate Lisp error if jarPathname
-            // doesn't exist.
-            LispObject jarTruename = truename(jarPathname, true); 
-
+            LispObject jarTruename = truename(jarPathname, false); 
+            
+            // We can't match anything in a non-existent jar 
+            if (jarTruename == NIL) {
+                return NIL;
+            }
+            
             LispObject result = NIL;
             String wild = "/" + pathname.asEntryPath();