2009-02-28 Gonzalo Paniagua Javier <gonzalo@novell.com>

[mono.git] / mcs / class / System.Web / System.Web.UI / HiddenFieldPageStatePersister.cs

diff --git a/mcs/class/System.Web/System.Web.UI/HiddenFieldPageStatePersister.cs b/mcs/class/System.Web/System.Web.UI/HiddenFieldPageStatePersister.cs
index 4b63fd38062999b1842fca7e48be663834b510fe..89926fff699cf8b8e4b466767b0620f04a85b69a 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/HiddenFieldPageStatePersister.cs
+++ b/mcs/class/System.Web/System.Web.UI/HiddenFieldPageStatePersister.cs
@@ -48,6 +48,15 @@ namespace System.Web.UI
                
                public override void Load ()
                {
+#if TARGET_J2EE
+                       if (Page.FacesContext != null) {
+                               if (Page.PageState != null) {
+                                       ViewState = Page.PageState.First;
+                                       ControlState = Page.PageState.Second;
+                               }
+                               return;
+                       }
+#endif
                        IStateFormatter formatter = StateFormatter;
                        Pair pair = formatter.Deserialize (Page.RawViewState) as Pair;
                        if (pair != null) {
@@ -58,6 +67,13 @@ namespace System.Web.UI
 
                public override void Save ()
                {
+#if TARGET_J2EE
+                       if (Page.FacesContext != null) {
+                               if (ViewState != null || ControlState != null)
+                                       Page.PageState = new Pair (ViewState, ControlState);
+                               return;
+                       }
+#endif
                        IStateFormatter formatter = StateFormatter;
                        Page.RawViewState = formatter.Serialize (new Pair (ViewState, ControlState));
                }