From 16e367d14de5b2ee79477a048e6c9203c4e1d83d Mon Sep 17 00:00:00 2001 From: Rodrigo Kumpera Date: Mon, 1 Jun 2009 22:02:19 +0000 Subject: [PATCH] 2009-06-01 Rodrigo Kumpera * 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 --- mono/metadata/ChangeLog | 7 +++++++ mono/metadata/icall.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index f82570bb846..5e908907f9c 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,10 @@ +2009-06-01 Rodrigo Kumpera + + * icall.c (ves_icall_System_Reflection_Assembly_InternalGetType): + Under the 2.0 profile raise the loader error. + + Fixes #508532. + 2009-06-01 Rodrigo Kumpera * marshal.c (mono_marshal_get_runtime_invoke): Emit the right kind diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c index fd312fb399d..acb9c11697d 100644 --- 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) -- 2.25.1