From 7605a08cab1a3849988042612a81a615ec758d40 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 21 Nov 2012 14:58:12 +0200
Subject: [PATCH] Avoid eternal spinner for exceptions in layout (#10257)

Change-Id: I24dfcf65c5eed90e930dd03663062860f8bda0fb
---
 .../com/vaadin/client/ApplicationConnection.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index 0dbc0984a7..da5942004f 100644
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -1473,9 +1473,13 @@ public class ApplicationConnection {
                         + (updateDuration.elapsedMillis() - startProcessing)
                         + " ms");
 
-                LayoutManager layoutManager = getLayoutManager();
-                layoutManager.setEverythingNeedsMeasure();
-                layoutManager.layoutNow();
+                try {
+                    LayoutManager layoutManager = getLayoutManager();
+                    layoutManager.setEverythingNeedsMeasure();
+                    layoutManager.layoutNow();
+                } catch (final Throwable e) {
+                    VConsole.error(e);
+                }
 
                 updateDuration
                         .logDuration(" * Layout processing completed", 10);
@@ -2064,8 +2068,8 @@ public class ApplicationConnection {
                             .getChildComponents();
                     if (!oldChildren.isEmpty()) {
                         /*
-                         * HasComponentsConnector has a separate child
-                         * component list that should also be cleared
+                         * HasComponentsConnector has a separate child component
+                         * list that should also be cleared
                          */
                         ccc.setChildComponents(Collections
                                 .<ComponentConnector> emptyList());
-- 
2.39.5