Fix NPE caused by fix for Grid resizing with split panel (#18370)

Change-Id: I0dfe71115db9f510e71e22ecfeffcd34fe5bd304
vaadin · Jul 8, 2015 · ce757b6 · ce757b6
1 parent 5220dad
commit ce757b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/client/src/com/vaadin/client/ui/VSplitPanelHorizontal.java b/client/src/com/vaadin/client/ui/VSplitPanelHorizontal.java
@@ -28,11 +28,11 @@ public VSplitPanelHorizontal() {
 
     @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
@@ -28,11 +28,11 @@ public VSplitPanelVertical() {
 
     @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);
         }
     }