Workaround for problem with wrong state being created

diff --git a/src/com/vaadin/ui/Root.java b/src/com/vaadin/ui/Root.java
index febfc8c4dd40e496df03210b1eecdb00b604ed32..541127e092ab7a17601530afd218b13593675eff 100644 (file)
--- a/src/com/vaadin/ui/Root.java
+++ b/src/com/vaadin/ui/Root.java
@@ -30,6 +30,7 @@ import com.vaadin.terminal.Resource;
 import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.terminal.WrappedRequest.BrowserDetails;
+import com.vaadin.terminal.gwt.client.ComponentState;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.notification.VNotification;
 import com.vaadin.terminal.gwt.client.ui.root.RootServerRPC;
@@ -473,6 +474,13 @@ public abstract class Root extends AbstractComponentContainer implements
         return (RootState) super.getState();
     }
 
+    @Override
+    protected ComponentState createState() {
+        // This is a workaround for a problem with creating the correct state
+        // object during build
+        return new RootState();
+    }
+
     /**
      * Overridden to return a value instead of referring to the parent.
      *