From e98080fc2045019f0197d63986900584ac611c81 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 8 Sep 2009 11:38:58 +0000
Subject: [PATCH] added minor visibility check to avoid error in hosted mode

svn changeset:8706/svn branch:6.1
---
 .../gwt/client/ui/layout/CellBasedLayout.java | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java b/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java
index c3f591df5d..1d4ed5b0f9 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java
@@ -215,15 +215,17 @@ public abstract class CellBasedLayout extends ComplexPanel implements Container
     }
 
     private void updateMarginAndSpacingInfo(UIDL uidl) {
-        int bitMask = uidl.getIntAttribute("margins");
-        if (activeMarginsInfo.getBitMask() != bitMask) {
-            activeMarginsInfo = new VMarginInfo(bitMask);
-            marginsNeedsRecalculation = true;
-        }
-        boolean spacing = uidl.getBooleanAttribute("spacing");
-        if (spacing != spacingEnabled) {
-            marginsNeedsRecalculation = true;
-            spacingEnabled = spacing;
+        if (!uidl.hasAttribute("invisible")) {
+            int bitMask = uidl.getIntAttribute("margins");
+            if (activeMarginsInfo.getBitMask() != bitMask) {
+                activeMarginsInfo = new VMarginInfo(bitMask);
+                marginsNeedsRecalculation = true;
+            }
+            boolean spacing = uidl.getBooleanAttribute("spacing");
+            if (spacing != spacingEnabled) {
+                marginsNeedsRecalculation = true;
+                spacingEnabled = spacing;
+            }
         }
     }
 
-- 
2.39.5