aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2008-12-15 06:33:13 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2008-12-15 06:33:13 +0000
commit557c36a5e9d70bedf20eb8d8b1f6c788013db535 (patch)
tree8c65fcaa9d42dbe81d783d9818593e64a8949db9
parent422543e2492bad6766bba1578f2913f505b296a0 (diff)
downloadvaadin-framework-557c36a5e9d70bedf20eb8d8b1f6c788013db535.tar.gz
vaadin-framework-557c36a5e9d70bedf20eb8d8b1f6c788013db535.zip
added null check that most likely fixes #2338
svn changeset:6207/svn branch:trunk
-rw-r--r--src/com/itmill/toolkit/terminal/gwt/server/DebugUtilities.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/DebugUtilities.java b/src/com/itmill/toolkit/terminal/gwt/server/DebugUtilities.java
index ce70dea3d1..e796e73f60 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/DebugUtilities.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/DebugUtilities.java
@@ -91,7 +91,8 @@ public class DebugUtilities {
Component parent = component.getParent();
Stack<ComponentInfo> attributes = null;
- if (hasRelativeHeight(component) && hasUndefinedHeight(parent)) {
+ if (hasRelativeHeight(component) && parent != null
+ && hasUndefinedHeight(parent)) {
if (parent instanceof AbstractOrderedLayout) {
AbstractOrderedLayout ol = (AbstractOrderedLayout) parent;
boolean vertical = false;
@@ -158,7 +159,8 @@ public class DebugUtilities {
Component parent = component.getParent();
Stack<ComponentInfo> attributes = null;
- if (hasRelativeWidth(component) && hasUndefinedWidth(parent)) {
+ if (hasRelativeWidth(component) && parent != null
+ && hasUndefinedWidth(parent)) {
if (parent instanceof AbstractOrderedLayout) {
AbstractOrderedLayout ol = (AbstractOrderedLayout) parent;
boolean horizontal = true;