diff options
| author | Artur Signell <artur@vaadin.com> | 2012-11-21 14:58:12 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-11-21 13:23:28 +0000 |
| commit | 7605a08cab1a3849988042612a81a615ec758d40 (patch) | |
| tree | c60be8a51ff745965307c424f9ee3c9dc5f7b768 | |
| parent | 6ed87c1b6ce280082c2dee21a6f87c1620e0ea79 (diff) | |
| download | vaadin-framework-7605a08cab1a3849988042612a81a615ec758d40.tar.gz vaadin-framework-7605a08cab1a3849988042612a81a615ec758d40.zip | |
Avoid eternal spinner for exceptions in layout (#10257)
Change-Id: I24dfcf65c5eed90e930dd03663062860f8bda0fb
| -rw-r--r-- | client/src/com/vaadin/client/ApplicationConnection.java | 14 |
1 files 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()); |