Index: ColumnTag.java
===================================================================
RCS file: /cvsroot/displaytag/displaytag2/src/java/org/displaytag/tags/ColumnTag.java,v
retrieving revision 1.36
diff -u -r1.36 ColumnTag.java
--- ColumnTag.java	23 May 2004 13:15:38 -0000	1.36
+++ ColumnTag.java	25 Jun 2004 15:52:48 -0000
@@ -532,38 +532,24 @@
             addHeaderToTable(tableTag);
         }
 
-        Cell cell;
-        if (this.property == null)
-        {
-
-            Object cellValue;
-
-            if (this.bodyContent != null)
-            {
-                String value = this.bodyContent.getString();
-
-                if (value == null && this.nulls)
-                {
-                    value = "";
-                }
-
-                cellValue = value;
-            }
-            // BodyContent will be null if the body was not eval'd, eg an empty list.
-            else
-            {
-                cellValue = Cell.EMPTY_CELL;
-            }
-            cell = new Cell(cellValue);
-
+        Cell cell = null;
+        
+        if ((this.bodyContent != null) && (this.bodyContent.getString().trim().length() > 0))
+        {
+          cell = new Cell(this.bodyContent.getString());
+        } 
+        else if (this.property != null) {
+          cell = Cell.EMPTY_CELL;
+        } 
+        else if (this.nulls){
+          cell = new Cell("");
+        } 
+        else {
+          cell = Cell.EMPTY_CELL;          
         }
-        else
-        {
-            cell = Cell.EMPTY_CELL;
-        }
-
+  
         tableTag.addCell(cell);
-
+      
         // cleanup non-attribute variables
         this.alreadySorted = false;