diff options
| author | Thomas <thomas@vaadin.com> | 2013-11-08 13:59:28 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-11-08 14:13:18 +0000 |
| commit | 8efc38528e6eaf5496dea2db514d3ba9c6df190d (patch) | |
| tree | 63d75259be6c45edd1bc7fa2ea948e9dd4e64556 /server/src/com/vaadin/ui/TreeTable.java | |
| parent | 0a2cf2c429fca3be697dcf37d386a4607d4bdbc3 (diff) | |
| download | vaadin-framework-8efc38528e6eaf5496dea2db514d3ba9c6df190d.tar.gz vaadin-framework-8efc38528e6eaf5496dea2db514d3ba9c6df190d.zip | |
Fixes NPE in TreeTable.setContainerDS(null) (#12928)
Change-Id: I7f3148e51d216dfe20a11c8a5fd922f43cbc673b
Diffstat (limited to 'server/src/com/vaadin/ui/TreeTable.java')
| -rw-r--r-- | server/src/com/vaadin/ui/TreeTable.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/TreeTable.java b/server/src/com/vaadin/ui/TreeTable.java index e150db9423..1c13eae8d9 100644 --- a/server/src/com/vaadin/ui/TreeTable.java +++ b/server/src/com/vaadin/ui/TreeTable.java @@ -590,11 +590,11 @@ public class TreeTable extends Table implements Hierarchical { // does not change component hierarchy during paint containerSupportsPartialUpdates = (newDataSource instanceof ItemSetChangeNotifier) && false; - if (!(newDataSource instanceof Hierarchical)) { + if (newDataSource != null && !(newDataSource instanceof Hierarchical)) { newDataSource = new ContainerHierarchicalWrapper(newDataSource); } - if (!(newDataSource instanceof Ordered)) { + if (newDataSource != null && !(newDataSource instanceof Ordered)) { newDataSource = new HierarchicalContainerOrderedWrapper( (Hierarchical) newDataSource); } |