diff options
| author | John Ahlroos <john@vaadin.com> | 2012-09-05 10:55:53 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2012-09-05 10:55:53 +0300 |
| commit | ef6576951baf5ab1edab74b878a03c49d74cdbd6 (patch) | |
| tree | 57d34faed2d7214f8b03ed8b865f4eb96d9f114e /client | |
| parent | b92a93f86a990a30a19cc7cae1b87fd35e262352 (diff) | |
| parent | e7e1b9e3033de1300ca1adfbd55f664f568f32f2 (diff) | |
| download | vaadin-framework-ef6576951baf5ab1edab74b878a03c49d74cdbd6.tar.gz vaadin-framework-ef6576951baf5ab1edab74b878a03c49d74cdbd6.zip | |
Merge branch 'master' into layoutgraph
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/LayoutManager.java | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/client/src/com/vaadin/client/LayoutManager.java b/client/src/com/vaadin/client/LayoutManager.java index e7617a6b0b..1106d6eae2 100644 --- a/client/src/com/vaadin/client/LayoutManager.java +++ b/client/src/com/vaadin/client/LayoutManager.java @@ -282,15 +282,18 @@ public class LayoutManager { for (Element element : listenersToFire) { Collection<ElementResizeListener> listeners = elementResizeListeners .get(element); - ElementResizeListener[] array = listeners - .toArray(new ElementResizeListener[listeners.size()]); - ElementResizeEvent event = new ElementResizeEvent(this, - element); - for (ElementResizeListener listener : array) { - try { - listener.onElementResize(event); - } catch (RuntimeException e) { - VConsole.error(e); + if (listeners != null) { + ElementResizeListener[] array = listeners + .toArray(new ElementResizeListener[listeners + .size()]); + ElementResizeEvent event = new ElementResizeEvent(this, + element); + for (ElementResizeListener listener : array) { + try { + listener.onElementResize(event); + } catch (RuntimeException e) { + VConsole.error(e); + } } } } |