In .:

2009-02-13 Rodrigo Kumpera  <rkumpera@novell.com>

	* reflection.c (mono_reflection_lookup_dynamic_token): Do the locking properly.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 2494dd2cedc85da6d6ae83b899a46e5a6f952e93..aea759d4815b4dd73fbea88a06a38baadc5cf133 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-13 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * reflection.c (mono_reflection_lookup_dynamic_token): Do the locking properly.
+
 2009-02-13  Zoltan Varga  <vargaz@gmail.com>
 
        * cominterop.c cominterop.h: New files.

diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c
index af6a736c9fbb94b762e56461a0c0e209eec4fc51..9611495dde9c340ed85af4e0d58f9b6fe29f4e57 100644 (file)
--- a/mono/metadata/reflection.c
+++ b/mono/metadata/reflection.c
@@ -10479,13 +10479,13 @@ mono_reflection_lookup_dynamic_token (MonoImage *image, guint32 token, gboolean
 
        mono_loader_lock ();
        obj = mono_g_hash_table_lookup (assembly->tokens, GUINT_TO_POINTER (token));
+       mono_loader_unlock ();
        if (!obj) {
                if (valid_token)
                        g_assert_not_reached ();
                else
                        return NULL;
        }
-       mono_loader_unlock ();
 
        if (!handle_class)
                handle_class = &klass;