Author: gert
Date: 2008-02-10 12:52:56 -0500 (Sun, 10 Feb 2008)
New Revision: 95391

Modified:
   trunk/mcs/class/corlib/System.Reflection/Assembly.cs
   trunk/mcs/class/corlib/System.Reflection/ChangeLog
Log:
* Assembly.cs: Use icall for ToString/FullName. Fixes bug #318231.


Modified: trunk/mcs/class/corlib/System.Reflection/Assembly.cs
===================================================================
--- trunk/mcs/class/corlib/System.Reflection/Assembly.cs        2008-02-10 
17:50:54 UTC (rev 95390)
+++ trunk/mcs/class/corlib/System.Reflection/Assembly.cs        2008-02-10 
17:52:56 UTC (rev 95391)
@@ -93,6 +93,9 @@
                private extern string get_code_base (bool escaped);
 
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
+               private extern string get_fullname ();
+
+               [MethodImplAttribute (MethodImplOptions.InternalCall)]
                private extern string get_location ();
 
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
@@ -363,7 +366,7 @@
 
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                internal extern static void InternalGetAssemblyName (string 
assemblyFile, AssemblyName aname);
-               
+
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                static extern void FillName (Assembly ass, AssemblyName aname);
 
@@ -397,10 +400,7 @@
                        if (assemblyName != null)
                                return assemblyName;
 
-                       AssemblyName aname = new AssemblyName ();
-                       FillName (this, aname);
-                       assemblyName = aname.ToString ();
-
+                       assemblyName = get_fullname ();
                        return assemblyName;
                }
 

Modified: trunk/mcs/class/corlib/System.Reflection/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Reflection/ChangeLog  2008-02-10 17:50:54 UTC 
(rev 95390)
+++ trunk/mcs/class/corlib/System.Reflection/ChangeLog  2008-02-10 17:52:56 UTC 
(rev 95391)
@@ -1,3 +1,7 @@
+2008-02-10  Gert Driesen  <[EMAIL PROTECTED]>
+
+       * Assembly.cs: Use icall for ToString/FullName. Fixes bug #318231.
+
 2008-02-02  Gert Driesen  <[EMAIL PROTECTED]>
 
        * MonoMethod.cs (MakeGenericMethod): Modified argument name to match

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to