Changeset 13092

Timestamp:

12/11/10 23:52:35 (12 years ago)

Author:

ehuelsmann

Message:

Store the original Java error in the "cause" field
of the UnhandledCondition? error, *if* the cause is a Java exception.

File:

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

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

@@ -493 +493 @@
         @Override
         public LispObject execute(LispObject first, LispObject second)
-            throws UnhandledCondition
         {
             final LispObject condition = first;
@@ -526 +525 @@
                 }
             }
-            throw new UnhandledCondition(condition);
+            UnhandledCondition uc = new UnhandledCondition(condition);
+            if (condition.typep(Symbol.JAVA_EXCEPTION) != NIL)
+                uc.initCause((Throwable)JavaException
+                        .JAVA_EXCEPTION_CAUSE.execute(condition).javaInstance());
+            throw uc;
         }
     };