summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2011-08-11 13:00:11 +0000
committerArtur Signell <artur.signell@itmill.com>2011-08-11 13:00:11 +0000
commit02ecf2b546f82f01e65db4f4a4b1dad17e9dae47 (patch)
treea84ceb201581270f3db72b687a6a330a7faf6ed2 /src
parent3c901dcead8a829ac06b1dbdd55a033001071572 (diff)
downloadvaadin-framework-02ecf2b546f82f01e65db4f4a4b1dad17e9dae47.tar.gz
vaadin-framework-02ecf2b546f82f01e65db4f4a4b1dad17e9dae47.zip
#5916 Added null check
svn changeset:20305/svn branch:6.7
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/ui/Table.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 1098b47e1c..5cdb2118a4 100644
--- 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