From 8efc38528e6eaf5496dea2db514d3ba9c6df190d Mon Sep 17 00:00:00 2001
From: Thomas <thomas@vaadin.com>
Date: Fri, 8 Nov 2013 13:59:28 +0200
Subject: Fixes NPE in TreeTable.setContainerDS(null) (#12928)

Change-Id: I7f3148e51d216dfe20a11c8a5fd922f43cbc673b
---
 server/src/com/vaadin/ui/TreeTable.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'server/src/com/vaadin')

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);
         }
-- 
cgit v1.2.3