From 5ff5dfda99760dfd9f7a0f60de5ffe407d455ab6 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 14 Mar 2012 13:02:52 +0200
Subject: [PATCH] Fixed handling of null widgets in split panel

---
 .../terminal/gwt/client/ui/VAbstractSplitPanel.java       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAbstractSplitPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VAbstractSplitPanel.java
index 046b2fff91..fbeb4ff963 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VAbstractSplitPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VAbstractSplitPanel.java
@@ -332,7 +332,9 @@ public class VAbstractSplitPanel extends ComplexPanel {
         if (firstChild != null) {
             firstChild.removeFromParent();
         }
-        super.add(w, firstContainer);
+        if (w != null) {
+            super.add(w, firstContainer);
+        }
         firstChild = w;
     }
 
@@ -340,7 +342,9 @@ public class VAbstractSplitPanel extends ComplexPanel {
         if (secondChild != null) {
             secondChild.removeFromParent();
         }
-        super.add(w, secondContainer);
+        if (w != null) {
+            super.add(w, secondContainer);
+        }
         secondChild = w;
     }
 
-- 
2.39.5