summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-03-14 13:02:52 +0200
committerArtur Signell <artur@vaadin.com>2012-03-14 16:01:13 +0200
commit5ff5dfda99760dfd9f7a0f60de5ffe407d455ab6 (patch)
treed98c493511cc515d4731adbeb16630bbf42f39cb
parenta99be9d622681366b9896dde6dc75f79b5ce6f4c (diff)
downloadvaadin-framework-5ff5dfda99760dfd9f7a0f60de5ffe407d455ab6.tar.gz
vaadin-framework-5ff5dfda99760dfd9f7a0f60de5ffe407d455ab6.zip
Fixed handling of null widgets in split panel
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VAbstractSplitPanel.java8
1 files 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;
}