diff options
| author | Artur Signell <artur@vaadin.com> | 2013-11-11 16:33:27 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-11-11 16:33:27 +0200 |
| commit | dd7e6fee8c4717df59699f04f7e72a6f2e92008f (patch) | |
| tree | 1d1e4e074b006d53977b6e8a77c9926b30b504db /server/src/com/vaadin | |
| parent | f51b8911ad7d9ee8f651cf037e30a09e09a5e530 (diff) | |
| parent | c308d8a949095ec49a6933d2d4424d078fb4e210 (diff) | |
| download | vaadin-framework-dd7e6fee8c4717df59699f04f7e72a6f2e92008f.tar.gz vaadin-framework-dd7e6fee8c4717df59699f04f7e72a6f2e92008f.zip | |
Merge changes from origin/7.1
30e9b7c Add a test for @mixin { @font-face {...} } (#11649)
0a2cf2c Prevent showing "Session Expired" notification if navigating away (#12298)
8efc385 Fixes NPE in TreeTable.setContainerDS(null) (#12928)
23815e6 Remove broken JSch check
c308d8a Fixes double scrollbar issue in browserframes (#11780) Fixed by adding font-size 0 to the base theme.
Change-Id: I64ae167e8e6b61205718998b80d534fb2cf0cb3d
Diffstat (limited to 'server/src/com/vaadin')
| -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); } |