summaryrefslogtreecommitdiffstats
path: root/client/src
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-01-07 20:06:06 +0200
committerArtur Signell <artur@vaadin.com>2013-01-07 22:27:47 +0200
commit3718ee8d22c2ec1d3a33422533594474901bce70 (patch)
tree143ca5dd9d39dd6887f6e7cb3123ede26a689672 /client/src
parent68406d87bb4dfb90d460ac02ef6412493f76eba7 (diff)
downloadvaadin-framework-3718ee8d22c2ec1d3a33422533594474901bce70.tar.gz
vaadin-framework-3718ee8d22c2ec1d3a33422533594474901bce70.zip
Fixed NPE in Tabsheet (#10479)
Change-Id: If1b5def25a463cfa4449ed476161a54a39f0770a
Diffstat (limited to 'client/src')
-rw-r--r--client/src/com/vaadin/client/ui/VTabsheet.java2
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;