fixes #2421, added some null checks

svn changeset:6432/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
index e135c30b2971866a06e166070f138cb3e17d692c..fa0a8b2641feb67d2185ce159cea242b6847a4d6 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
@@ -271,7 +271,8 @@ public class IGridLayout extends SimplePanel implements Paintable, Container {
                         Cell[] column = cells[i];
                         for (int j = 0; j < column.length; j++) {
                             Cell c = column[j];
-                            if (c != null && c.widthCanAffectHeight()) {
+                            if (c != null && c.cc != null
+                                    && c.widthCanAffectHeight()) {
                                 c.cc.setContainerSize(c.getAvailableWidth(), c
                                         .getAvailableHeight());
                                 client.handleComponentRelativeSize(c.cc
@@ -768,6 +769,7 @@ public class IGridLayout extends SimplePanel implements Paintable, Container {
                 for (int j = 0; j < cells[i].length; j++) {
                     Cell cell = cells[i][j];
                     if (cell != null
+                            && cell.cc != null
                             && (cell.hasRelativeHeight() || cell
                                     .hasRelativeWidth())) {
                         client.handleComponentRelativeSize(cell.cc.getWidget());