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

2 files changed, 17 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);
         }
diff --git a/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNull.java b/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNull.java
new file mode 100644
index 0000000000..a3b79a14f0
--- /dev/null
+++ b/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNull.java
@@ -0,0 +1,15 @@
+package com.vaadin.tests.server.component.treetable;
+
+import junit.framework.TestCase;
+
+import com.vaadin.ui.TreeTable;
+
+public class TreeTableSetContainerNull extends TestCase {
+
+    public void testNullContainer() {
+        TreeTable treeTable = new TreeTable();
+
+        // should not cause an exception
+        treeTable.setContainerDataSource(null);
+    }
+}