Avoid eternal spinner for exceptions in layout (#10257)

Change-Id: I24dfcf65c5eed90e930dd03663062860f8bda0fb

diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index 0dbc0984a74d74de5f53c5bda6ba561040d46f2e..da5942004f666860bcd6b53863a8f6d6c35b9848 100644 (file)
--- 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());