* thread.c (rb_barrier_wait): gets rid of recursive deadlock.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20230 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 0 deletions

diff --git a/thread.c b/thread.c
index 55f749ed1..f49e2e2e4 100644
--- a/thread.c
+++ b/thread.c
@@ -3050,8 +3050,11 @@ VALUE
 rb_barrier_wait(VALUE self)
 {
     VALUE mutex = (VALUE)DATA_PTR(self);
+    mutex_t *m;
 
     if (!mutex) return Qfalse;
+    GetMutexPtr(mutex, m);
+    if (m->th == GET_THREAD()) return Qfalse;
     rb_mutex_lock(mutex);
     if (DATA_PTR(self)) return Qtrue;
     rb_mutex_unlock(mutex);