From 20ac4bb2949bf0267ac512f1135fe206265d273f Mon Sep 17 00:00:00 2001 From: Vladimir Krasnov Date: Mon, 9 Jan 2006 17:34:33 +0000 Subject: [PATCH] * ObjectStateFormatter.cs: Merged TARGET_JVM parts in TypeFormatter.Read, TypeFormatter.Write from /main/5 svn path=/trunk/mcs/; revision=55246 --- mcs/class/System.Web/System.Web.UI/ChangeLog | 5 +++++ .../System.Web/System.Web.UI/ObjectStateFormatter.cs | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog index b394d868be9..7089e5cb38d 100644 --- a/mcs/class/System.Web/System.Web.UI/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI/ChangeLog @@ -1,3 +1,8 @@ +2006-01-09 Vladimir Krasnov + + * ObjectStateFormatter.cs: Merged TARGET_JVM parts in + TypeFormatter.Read, TypeFormatter.Write from /main/5 + 2006-01-09 Konstantin Triger * Page.cs: make ProcessRequest virtual under TARGET_JVM. diff --git a/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs b/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs index 678e939f518..a5d5fbdb6bc 100644 --- a/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs +++ b/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs @@ -721,9 +721,10 @@ namespace System.Web.UI { } else { w.Write (PrimaryId); w.Write (((Type) o).FullName); - +#if !TRAGET_JVM // We should cache the name of the assembly w.Write (((Type) o).Assembly.FullName); +#endif } } @@ -731,9 +732,12 @@ namespace System.Web.UI { { if (token == PrimaryId) { string type = r.ReadString (); +#if !TARGET_JVM string assembly = r.ReadString (); - Type t = Assembly.Load (assembly).GetType (type); +#else + Type t = Type.GetType(type); +#endif ctx.CacheItem (t); return t; } else { -- 2.25.1