#5916 Added null check

svn changeset:20305/svn branch:6.7

diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 1098b47e1c4268952113417615a8739f862cdbfe..5cdb2118a4331edb849ec42b45638af7d28842ae 100644 (file)
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -1559,7 +1559,7 @@ public class Table extends AbstractSelect implements Action.Container,
                             ColumnGenerator cg = columnGenerators
                                     .get(colids[j]);
                             value = cg.generateCell(this, id, colids[j]);
-                            if (!(value instanceof Component)
+                            if (value != null && !(value instanceof Component)
                                     && !(value instanceof String)) {
                                 // Avoid errors if a generator returns something
                                 // other than a Component or a String