cvs server: Diffing gnu/kawa/functions
Index: gnu/kawa/functions/ChangeLog
===================================================================
RCS file: /cvs/kawa/kawa/gnu/kawa/functions/ChangeLog,v
retrieving revision 1.56
diff -u -w -r1.56 ChangeLog
--- gnu/kawa/functions/ChangeLog	10 Nov 2003 20:16:42 -0000	1.56
+++ gnu/kawa/functions/ChangeLog	14 Dec 2003 08:29:22 -0000
@@ -1,3 +1,8 @@
+2003-12-14  Chris Dean <ctdean@sokitomi.com>
+
+	* DisplayFormat.java (AbstractFormat): Allow obj.toString() to
+	return null.
+
 2003-11-10  Per Bothner  <per@bothner.com>
 
 	* ParseFormat.java (parseFormat):  Allow '*' for precision.
Index: gnu/kawa/functions/DisplayFormat.java
===================================================================
RCS file: /cvs/kawa/kawa/gnu/kawa/functions/DisplayFormat.java,v
retrieving revision 1.9
diff -u -w -r1.9 DisplayFormat.java
--- gnu/kawa/functions/DisplayFormat.java	6 Apr 2003 05:33:22 -0000	1.9
+++ gnu/kawa/functions/DisplayFormat.java	14 Dec 2003 08:29:22 -0000
@@ -156,10 +156,15 @@
       ((Consumable) obj).consume(out);
     else if (obj instanceof Printable && out instanceof PrintWriter)
       ((Printable) obj).print((PrintWriter) out);
-    else if (obj == null)
+    else {
+      String asString = null;
+      if( obj != null )
+        asString = obj.toString();
+      if (asString == null)
       write("#!null", out);
     else
-      write (obj.toString(), out);
+        write (asString, out);
+    }
   }
 
   /** Recursive helper method for writing out Array (sub-) objects.