From ccac8c148ff5a7da9a7b61f3a9b06e49b2cf1d86 Mon Sep 17 00:00:00 2001 From: gonzalo Date: Sat, 24 Jan 2009 05:34:08 +0000 Subject: [PATCH] 2009-01-24 Gonzalo Paniagua Javier * appdomain.c: return NULL instead of throwing FileNotFoundException when LoadAssembly() fails. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mono@124404 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- mono/metadata/ChangeLog | 5 +++++ mono/metadata/appdomain.c | 9 ++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index a1166d6e0..5a8d55924 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,8 @@ +2009-01-24 Gonzalo Paniagua Javier + + * appdomain.c: return NULL instead of throwing FileNotFoundException + when LoadAssembly() fails. + 2009-01-23 Mark Probst * metadata.c (mono_metadata_generic_param_equal): Only compare the diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c index 0d765da70..22c9c3a0e 100644 --- a/mono/metadata/appdomain.c +++ b/mono/metadata/appdomain.c @@ -1694,11 +1694,8 @@ ves_icall_System_AppDomain_LoadAssembly (MonoAppDomain *ad, MonoString *assRef, g_free (name); if (!parsed) { - MonoException *exc; - /* This is a parse error... */ - exc = mono_get_exception_file_not_found2 (NULL, assRef); - mono_raise_exception (exc); + return NULL; } ass = mono_assembly_load_full_nosearch (&aname, NULL, &status, refOnly); @@ -1711,9 +1708,7 @@ ves_icall_System_AppDomain_LoadAssembly (MonoAppDomain *ad, MonoString *assRef, else refass = NULL; if (!refass) { - /* FIXME: it doesn't make much sense since we really don't have a filename ... */ - MonoException *exc = mono_get_exception_file_not_found2 (NULL, assRef); - mono_raise_exception (exc); + return NULL; } } -- 2.11.4.GIT