diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-01-08 08:27:13 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-01-08 08:27:13 +0000 |
| commit | 0eb91d3c97266cc3fca4790df067dcb94093f2f4 (patch) | |
| tree | 04b9be47c2cc9f5987c7e9b6613af48767a4daba /client/src | |
| parent | fb30121d333447f73fa8a204094256ffcb734477 (diff) | |
| parent | 3718ee8d22c2ec1d3a33422533594474901bce70 (diff) | |
| download | vaadin-framework-0eb91d3c97266cc3fca4790df067dcb94093f2f4.tar.gz vaadin-framework-0eb91d3c97266cc3fca4790df067dcb94093f2f4.zip | |
Merge "Fixed NPE in Tabsheet (#10479)"
Diffstat (limited to 'client/src')
| -rw-r--r-- | client/src/com/vaadin/client/ui/VTabsheet.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java index 6d3f2365e2..e39742b2fa 100644 --- a/client/src/com/vaadin/client/ui/VTabsheet.java +++ b/client/src/com/vaadin/client/ui/VTabsheet.java @@ -748,7 +748,7 @@ public class VTabsheet extends VTabsheetBase implements Focusable, // style inheritance) if (ComponentStateUtil.hasStyles(state)) { final List<String> styles = state.styles; - if (!currentStyle.equals(styles.toString())) { + if (currentStyle == null || !currentStyle.equals(styles.toString())) { currentStyle = styles.toString(); final String tabsBaseClass = TABS_CLASSNAME; String tabsClass = tabsBaseClass; |