1 files changed, 18 insertions, 4 deletions
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataBoundControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataBoundControl.cs
index 7c14828aa1f..561b15168d6 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DataBoundControl.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataBoundControl.cs
@@ -156,14 +156,28 @@ namespace System.Web.UI.WebControls {
 		[ThemeableAttribute (false)]
 		[DefaultValueAttribute ("")]
 		[WebCategoryAttribute ("Data")]
-		public virtual string DataMember {
-			get { return ViewState.GetString ("DataMember", ""); }
-			set { ViewState["DataMember"] = value; }
+		public virtual string DataMember
+		{
+			get {
+				object o = ViewState["DataMember"];
+				if(o!=null)
+					return (string)o;
+				return String.Empty;
+			}
+			set {
+				ViewState["DataMember"] = value;
+			}
 		}
 
 		[IDReferencePropertyAttribute (typeof(DataSourceControl))]
 		public override string DataSourceID {
-			get { return ViewState.GetString ("DataSourceID", ""); }
+			get {
+				object o = ViewState ["DataSourceID"];
+				if (o != null)
+					return (string)o;
+				
+				return String.Empty;
+			}
 			set {
 				ViewState ["DataSourceID"] = value;
 				base.DataSourceID = value;