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

[Alessio Stalla]

Author: astalla
Date: Tue Jul 20 17:04:41 2010
New Revision: 12815

Log:
Fixed printing of certain conditions (e.g., type-errors) with unbound format-control.


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

Modified: trunk/abcl/src/org/armedbear/lisp/Condition.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Condition.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Condition.java	Tue Jul 20 17:04:41 2010
@@ -104,7 +104,7 @@
 
   public final LispObject getFormatControl()
   {
-    return getInstanceSlotValue(Symbol.FORMAT_CONTROL);
+      return getInstanceSlotValue(Symbol.FORMAT_CONTROL);
   }
 
   public final void setFormatControl(LispObject formatControl)
@@ -135,7 +135,8 @@
    */
   public String getMessage()
   {
-    return getFormatControl().toString();
+      LispObject formatControl = getFormatControl();
+      return formatControl != UNBOUND_VALUE ? formatControl.writeToString() : null;
   }
 
   @Override