2009-06-01 Rodrigo Kumpera <rkumpera@novell.com>

	* icall.c (ves_icall_System_Reflection_Assembly_InternalGetType):
	Under the 2.0 profile raise the loader error.

	Fixes #508532.

svn path=/trunk/mono/; revision=135159

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index f82570bb8460078953d560264f331ed756e59548..5e908907f9cf9ca398d35f0116039fd672e22fa2 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-01 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * icall.c (ves_icall_System_Reflection_Assembly_InternalGetType):
+       Under the 2.0 profile raise the loader error.
+
+       Fixes #508532.
+
 2009-06-01 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * marshal.c (mono_marshal_get_runtime_invoke): Emit the right kind

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index fd312fb399d091bc96b0816791b07f9b8cbb6913..acb9c11697df29b401492320ff102ae560422081 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -4389,6 +4389,9 @@ ves_icall_System_Reflection_Assembly_InternalGetType (MonoReflectionAssembly *as
                if (throwOnError)
                        e = mono_get_exception_type_load (name, NULL);
 
+               if (mono_loader_get_last_error () && mono_defaults.generic_ilist_class)
+                       e = mono_loader_error_prepare_exception (mono_loader_get_last_error ());
+
                mono_loader_clear_error ();
 
                if (e != NULL)