Author: zoltan
Date: 2006-09-11 12:30:25 -0400 (Mon, 11 Sep 2006)
New Revision: 65241

Modified:
   trunk/mono/mono/metadata/ChangeLog
   trunk/mono/mono/metadata/class.c
Log:
2006-09-11  Zoltan Varga  <[EMAIL PROTECTED]>

        * class.c (mono_class_from_name_case): Fix regression introduced by the 
last
        change.


Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog  2006-09-11 16:14:16 UTC (rev 65240)
+++ trunk/mono/mono/metadata/ChangeLog  2006-09-11 16:30:25 UTC (rev 65241)
@@ -1,4 +1,8 @@
+2006-09-11  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * class.c (mono_class_from_name_case): Fix regression introduced by the 
last
+       change.
+
 Mon Sep 11 12:57:15 CEST 2006 Paolo Molaro <[EMAIL PROTECTED]>
 
        * gc-internal.h, appdomain.c, gc.c: force-destroy GC handles on domain

Modified: trunk/mono/mono/metadata/class.c
===================================================================
--- trunk/mono/mono/metadata/class.c    2006-09-11 16:14:16 UTC (rev 65240)
+++ trunk/mono/mono/metadata/class.c    2006-09-11 16:30:25 UTC (rev 65241)
@@ -3957,6 +3957,11 @@
 
        image->name_cache = g_hash_table_new (g_str_hash, g_str_equal);
 
+       if (image->dynamic) {
+               mono_loader_unlock ();
+               return;
+       }
+
        /* Temporary hash table to avoid lookups in the nspace_table */
        name_cache2 = g_hash_table_new (NULL, NULL);
 
@@ -4076,7 +4081,7 @@
 
                mono_loader_lock ();
 
-               if (image->name_cache)
+               if (!image->name_cache)
                        mono_image_init_name_cache (image);
 
                user_data.key = name_space;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to