Changed the rendering order of TabSheet tabs to prevent an NPE in isClipped (#12343)

Change-Id: Ife96ff3fe0c3f9c8926cf96eab4f5dfca99e925e

1 files changed, 4 insertions, 5 deletions

diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java
index a930ac5b58..379b6107f4 100644
--- a/client/src/com/vaadin/client/ui/VTabsheet.java
+++ b/client/src/com/vaadin/client/ui/VTabsheet.java
@@ -840,6 +840,10 @@ public class VTabsheet extends VTabsheetBase implements Focusable,
         if (tab == null) {
             tab = tb.addTab();
         }
+        if (selected) {
+            renderContent(tabUidl.getChildUIDL(0));
+            tb.selectTab(index);
+        }
         tab.updateFromUIDL(tabUidl);
         tab.setEnabledOnServer((!disabledTabKeys.contains(tabKeys.get(index))));
         tab.setHiddenOnServer(hidden);
@@ -856,11 +860,6 @@ public class VTabsheet extends VTabsheetBase implements Focusable,
          * and tabs won't be too narrow in certain browsers
          */
         tab.recalculateCaptionWidth();
-
-        if (selected) {
-            renderContent(tabUidl.getChildUIDL(0));
-            tb.selectTab(index);
-        }
     }
 
     /**