2007-03-06 Zoltan Varga <vargaz@gmail.com>

	* assembly.c (mono_assembly_load_from_full): Call mono_assemblies_unlock ()
	a little earlier.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 8e1252aa16a3564b93ec5c3702898bbf020f3fd4..ffb95e127b7da1ceb1515c2fe9c8e39e994795b2 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,12 @@
+2007-03-06  Zoltan Varga  <vargaz@gmail.com>
+
+       * assembly.c (mono_assembly_load_from_full): Call mono_assemblies_unlock ()
+       a little earlier.
+
+       * icall.c (ves_icall_type_Equals): Rename this to ves_icall_System_Type_EqualsInternal.
+
+       * icall-def.h: Rename Type:Equals to Type:EqualsInternal.
+
 2007-03-05  Miguel de Icaza  <miguel@novell.com>
 
        * file-io.c (ves_icall_System_IO_MonoIO_Open): Use the new

diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
index 153dba72c606682c5a0695091167642beb38245d..d8d739f7010ee9d0ce0e215322a002450b962370 100644 (file)
--- a/mono/metadata/assembly.c
+++ b/mono/metadata/assembly.c
@@ -1471,11 +1471,11 @@ mono_assembly_load_from_full (MonoImage *image, const char*fname,
                /* avoid loading the same assembly twice for now... */
                ass2 = search_loaded (&ass->aname, refonly);
                if (ass2) {
+                       mono_assemblies_unlock ();
                        g_free (ass);
                        g_free (base_dir);
                        mono_image_close (image);
                        *status = MONO_IMAGE_OK;
-                       mono_assemblies_unlock ();
                        return ass2;
                }
        }