* load.c (load_lock): reverted.

* thread.c (rb_barrier_wait): check for recursive wait.


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

1 files changed, 3 insertions, 0 deletions

diff --git a/thread.c b/thread.c
index 5fd2033f0..ae0c3b3bf 100644
--- a/thread.c
+++ b/thread.c
@@ -2555,6 +2555,9 @@ rb_barrier_wait(VALUE self)
 	if (thlist_signal(&barrier->waiting, 1, &barrier->owner)) return Qfalse;
 	return Qtrue;
     }
+    else if (barrier->owner == GET_THREAD()) {
+	return Qfalse;
+    }
     else {
 	*barrier->tail = q = ALLOC(rb_thread_list_t);
 	q->th = GET_THREAD();