[armedbear-cvs] r12821 - branches/0.21.x/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Thu Jul 22 14:34:09 2010
New Revision: 12821

Log:
Backport r12815 (printing of conditions with unbound format-control).

Modified:
   branches/0.21.x/abcl/src/org/armedbear/lisp/Condition.java

Modified: branches/0.21.x/abcl/src/org/armedbear/lisp/Condition.java
==============================================================================
--- branches/0.21.x/abcl/src/org/armedbear/lisp/Condition.java	(original)
+++ branches/0.21.x/abcl/src/org/armedbear/lisp/Condition.java	Thu Jul 22 14:34:09 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