* ObjectStateFormatter.cs: Merged TARGET_JVM parts in

TypeFormatter.Read, TypeFormatter.Write from /main/5

svn path=/trunk/mcs/; revision=55246

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index b394d868be9abc1be5ebec61d21f53ab53cd7b69..7089e5cb38d11d77d1146742de03240a5208f074 100644 (file)
--- 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  <vladimirk@mainsoft.com>
+
+       * ObjectStateFormatter.cs: Merged TARGET_JVM parts in 
+       TypeFormatter.Read, TypeFormatter.Write from /main/5
+
 2006-01-09  Konstantin Triger <kostat@mainsoft.com>
 
        * 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 678e939f5183a5c4cd399153079511e45ee07d16..a5d5fbdb6bc085a99ca999a885f12136725c1059 100644 (file)
--- 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 {