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

[mevenson at common-lisp.net]

Author: mevenson
Date: Fri Oct 12 03:47:28 2012
New Revision: 14183

Log:
Diagnostic:  return something meaningful at Stas' breakage.

Status: currently cannot duplicate.  Building Ubuntu testing image.

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	Fri Oct 12 03:47:26 2012	(r14182)
+++ trunk/abcl/src/org/armedbear/lisp/Load.java	Fri Oct 12 03:47:28 2012	(r14183)
@@ -38,6 +38,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.text.MessageFormat;
 
 /* This file holds ABCL's (FASL and non-FASL) loading behaviours.
  *
@@ -165,7 +166,10 @@
                 n = "jar:file:" + Pathname.uriEncode(n) + "!/" + name + "."
                     + 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)) {
                 // Maybe the enclosing JAR has been renamed?