From: Artur Signell <artur@vaadin.com>
Date: Mon, 7 Jan 2013 18:06:06 +0000 (+0200)
Subject: Fixed NPE in Tabsheet (#10479)
X-Git-Tag: 7.0.0.rc1~76^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3718ee8d22c2ec1d3a33422533594474901bce70;p=vaadin-framework.git

Fixed NPE in Tabsheet (#10479)

Change-Id: If1b5def25a463cfa4449ed476161a54a39f0770a
---

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;