From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 7 Jan 2009 13:54:58 +0000 (+0000)
Subject: fixes #2421, added some null checks
X-Git-Tag: 6.7.0.beta1~3408
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=22100f9e8a3270ec70dbd2b87c12befb4c037186;p=vaadin-framework.git

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 e135c30b29..fa0a8b2641 100644
--- 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());