diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-07-07 16:41:33 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-07-08 11:00:13 +0300 |
| commit | ce757b6aba8fc39af2d95371beb862318170f759 (patch) | |
| tree | c93f8ff4c093188e4b33a2e62b2c5324adfbcf5c | |
| parent | 5220dadc565fe1b1682d44663b7e8971a997a95b (diff) | |
| download | vaadin-framework-ce757b6aba8fc39af2d95371beb862318170f759.tar.gz vaadin-framework-ce757b6aba8fc39af2d95371beb862318170f759.zip | |
Fix NPE caused by fix for Grid resizing with split panel (#18370)7.5.1
Change-Id: I0dfe71115db9f510e71e22ecfeffcd34fe5bd304
| -rw-r--r-- | client/src/com/vaadin/client/ui/VSplitPanelHorizontal.java | 4 | ||||
| -rw-r--r-- | client/src/com/vaadin/client/ui/VSplitPanelVertical.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/client/src/com/vaadin/client/ui/VSplitPanelHorizontal.java b/client/src/com/vaadin/client/ui/VSplitPanelHorizontal.java index 5d918153b3..1a3e699b20 100644 --- a/client/src/com/vaadin/client/ui/VSplitPanelHorizontal.java +++ b/client/src/com/vaadin/client/ui/VSplitPanelHorizontal.java @@ -28,11 +28,11 @@ public class VSplitPanelHorizontal extends VAbstractSplitPanel { @Override protected void startResize() { - if (isWidgetFullWidth(getFirstWidget())) { + if (getFirstWidget() != null && isWidgetFullWidth(getFirstWidget())) { getFirstContainer().getStyle().setOverflow(Overflow.HIDDEN); } - if (isWidgetFullWidth(getSecondWidget())) { + if (getSecondWidget() != null && isWidgetFullWidth(getSecondWidget())) { getSecondContainer().getStyle().setOverflow(Overflow.HIDDEN); } } diff --git a/client/src/com/vaadin/client/ui/VSplitPanelVertical.java b/client/src/com/vaadin/client/ui/VSplitPanelVertical.java index 376b18e171..7baed03ca3 100644 --- a/client/src/com/vaadin/client/ui/VSplitPanelVertical.java +++ b/client/src/com/vaadin/client/ui/VSplitPanelVertical.java @@ -28,11 +28,11 @@ public class VSplitPanelVertical extends VAbstractSplitPanel { @Override protected void startResize() { - if (isWidgetFullHeight(getFirstWidget())) { + if (getFirstWidget() != null && isWidgetFullHeight(getFirstWidget())) { getFirstContainer().getStyle().setOverflow(Overflow.HIDDEN); } - if (isWidgetFullHeight(getSecondWidget())) { + if (getSecondWidget() != null && isWidgetFullHeight(getSecondWidget())) { getSecondContainer().getStyle().setOverflow(Overflow.HIDDEN); } } |