[asp.net] HiddenFieldPageStatePersister must not attempt to deserialize an empty...

diff --git a/mcs/class/System.Web/System.Web.UI/HiddenFieldPageStatePersister.cs b/mcs/class/System.Web/System.Web.UI/HiddenFieldPageStatePersister.cs
index b66bffcb7507504470c6d3bd777ab6723209fdc9..5c0ae028877b9d46b08786bb32917f6362c25d54 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/HiddenFieldPageStatePersister.cs
+++ b/mcs/class/System.Web/System.Web.UI/HiddenFieldPageStatePersister.cs
@@ -53,11 +53,14 @@ namespace System.Web.UI
                                return;
                        }
 #endif
+                       string rawViewState = Page.RawViewState;
                        IStateFormatter formatter = StateFormatter;
-                       Pair pair = formatter.Deserialize (Page.RawViewState) as Pair;
-                       if (pair != null) {
-                               ViewState = pair.First;
-                               ControlState = pair.Second;
+                       if (!String.IsNullOrEmpty (rawViewState)) {
+                               Pair pair = formatter.Deserialize (rawViewState) as Pair;
+                               if (pair != null) {
+                                       ViewState = pair.First;
+                                       ControlState = pair.Second;
+                               }
                        }
                }