2004-10-25 Zoltan Varga <vargaz@freemail.hu>

	* assembly.c (mono_assembly_names_equal): Compare the cultures as well,
	so multiple satellite assemblies for the same name can be loaded.
	Fixes #68259.

	* mono_domain_assembly_preload: Actually return the loaded assembly,
	not NULL.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 30fe574caa32031358a30c0cbdec038712cbb06a..f8048824c09a55f4c6a7575f03efbfe9b9941c95 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,5 +1,12 @@
 2004-10-25  Zoltan Varga  <vargaz@freemail.hu>
 
+       * assembly.c (mono_assembly_names_equal): Compare the cultures as well,
+       so multiple satellite assemblies for the same name can be loaded.
+       Fixes #68259.
+
+       * mono_domain_assembly_preload: Actually return the loaded assembly, 
+       not NULL.
+
        * icall.c (ves_icall_type_is_subtype_of): Fix this for byref types.
        (ves_icall_type_is_assignable_from): Ditto. Fixes #68582.
 

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index d873095401bd7f514dc1ca8586047029966cc8ad..9c955b2ba6895013493769e69bdee3b7b83d1f70 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -795,7 +795,7 @@ mono_domain_assembly_preload (MonoAssemblyName *aname,
                result = real_load (assemblies_path, aname->culture, aname->name);
        }
 
-       return NULL;
+       return result;
 }
 
 /*

diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
index a80cd4fc924ab57b2ba2cb24d04fd9e333e8a746..f0a84ed8dc73c1aaf120853116d94ef0bdf995ad 100644 (file)
--- a/mono/metadata/assembly.c
+++ b/mono/metadata/assembly.c
@@ -129,6 +129,9 @@ mono_assembly_names_equal (MonoAssemblyName *l, MonoAssemblyName *r)
        if (strcmp (l->name, r->name))
                return FALSE;
 
+       if ((l->culture && !r->culture) || (!l->culture && r->culture) || strcmp (l->culture, r->culture))
+               return FALSE;
+
         /*
          * simply compare names until some other issues are resolved
          * (version info not getting set correctly for custom