X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Floader.c;h=f950055953eaa5f728b435c793012fb8ac6f895d;hb=3953bef4aa4a41009b8051bb60c034a52e8c0ca4;hp=18941dc4a2a4acb1e1c657cdb21913b6e84534c3;hpb=05007a63c593ae2ae959613d4fc95896f7d6cf60;p=mono.git diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c index 18941dc4a2a..f950055953e 100644 --- a/mono/metadata/loader.c +++ b/mono/metadata/loader.c @@ -532,13 +532,13 @@ mono_field_from_token (MonoImage *image, guint32 token, MonoClass **retklass, return result; } - mono_loader_lock (); + mono_image_lock (image); if ((field = g_hash_table_lookup (image->field_cache, GUINT_TO_POINTER (token)))) { *retklass = field->parent; - mono_loader_unlock (); + mono_image_unlock (image); return field; } - mono_loader_unlock (); + mono_image_unlock (image); if (mono_metadata_token_table (token) == MONO_TABLE_MEMBERREF) field = field_from_memberref (image, token, retklass, context); @@ -555,10 +555,10 @@ mono_field_from_token (MonoImage *image, guint32 token, MonoClass **retklass, field = mono_class_get_field (k, token); } - mono_loader_lock (); + mono_image_lock (image); if (field && field->parent && !field->parent->generic_class && !field->parent->generic_container) g_hash_table_insert (image->field_cache, GUINT_TO_POINTER (token), field); - mono_loader_unlock (); + mono_image_unlock (image); return field; }