diff options
| author | John Ahlroos <john@vaadin.com> | 2012-09-05 10:55:20 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2012-09-05 10:55:20 +0300 |
| commit | e7e1b9e3033de1300ca1adfbd55f664f568f32f2 (patch) | |
| tree | 0fd6c82017d8b0ea962cb1975270c7c7a58c74eb /client | |
| parent | c14171d1344f1360ae4a95cd9494ab2829d439d4 (diff) | |
| download | vaadin-framework-e7e1b9e3033de1300ca1adfbd55f664f568f32f2.tar.gz vaadin-framework-e7e1b9e3033de1300ca1adfbd55f664f568f32f2.zip | |
Fixed NPE in LayoutManager
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 7b6fe19a37..56622cbd1d 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); + } } } } |