From 69983d0aa0400a3c110e960d0f9da0ca0a59a094 Mon Sep 17 00:00:00 2001
From: Juho Nurminen <juho@vaadin.com>
Date: Mon, 27 Jan 2014 13:30:38 +0200
Subject: [PATCH] Re-adjusted the rendering order of TabSheet tabs to prevent
 an NPE in isClipped (#12343)

Change-Id: I0705c02c12b5f0e998fda68fd7a144e45173a75e
---
 client/src/com/vaadin/client/ui/VTabsheet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java
index b65f058a46..a3d96983e8 100644
--- a/client/src/com/vaadin/client/ui/VTabsheet.java
+++ b/client/src/com/vaadin/client/ui/VTabsheet.java
@@ -841,8 +841,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable,
             tab = tb.addTab();
         }
         if (selected) {
-            renderContent(tabUidl.getChildUIDL(0));
             tb.selectTab(index);
+            renderContent(tabUidl.getChildUIDL(0));
         }
         tab.updateFromUIDL(tabUidl);
         tab.setEnabledOnServer((!disabledTabKeys.contains(tabKeys.get(index))));
-- 
2.39.5