Changeset 14183

Timestamp:

10/12/12 10:47:28 (8 years ago)

Author:

Mark Evenson

Message:

Diagnostic: return something meaningful at Stas' breakage.

Status: currently cannot duplicate. Building Ubuntu testing image.

File:

• trunk/abcl/src/org/armedbear/lisp/Load.java (modified) (2 diffs)

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

@@ -39 +39 @@
 import java.io.InputStream;
 import java.net.URL;
+import java.text.MessageFormat;
 
 /* This file holds ABCL's (FASL and non-FASL) loading behaviours.
@@ -166 +167 @@
                     + COMPILE_FILE_INIT_FASL_TYPE;
             }
-            mergedPathname = new Pathname(n);
+            if (!((mergedPathname = new Pathname(n)) instanceof Pathname)) {
+              return error(new FileError((MessageFormat.format("Failed to address JAR-PATHNAME truename {0} for name {1}", truename.princToString(), name)), truename));
+            }
+
             LispObject initTruename = Pathname.truename(mergedPathname);
             if (initTruename == null || initTruename.equals(NIL)) {