From 4755f0d2e7216acdab91826b4a2272016bfde7c6 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 15 Jul 2006 14:50:49 +0000
Subject: * eval.c (rb_require_safe): wait for another thread requiring the
 same   feature.  fixed: [ruby-core:08229]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 eval.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'eval.c')

diff --git a/eval.c b/eval.c
index d16549178..c05abffe6 100644
--- a/eval.c
+++ b/eval.c
@@ -7137,12 +7137,11 @@ rb_require_safe(fname, safe)
 	ruby_safe_level = safe;
 	found = search_required(fname, &feature, &path);
 	if (found) {
-	    if (!path || load_wait(RSTRING(path)->ptr)) {
+	    if (!path || load_wait(RSTRING(feature)->ptr)) {
 		result = Qfalse;
 	    }
 	    else {
 		ruby_safe_level = 0;
-		rb_provide_feature(feature);
 		switch (found) {
 		  case 'r':
 		    /* loading ruby library should be serialized. */
@@ -7165,6 +7164,7 @@ rb_require_safe(fname, safe)
 		    rb_ary_push(ruby_dln_librefs, LONG2NUM(handle));
 		    break;
 		}
+		rb_provide_feature(feature);
 		result = Qtrue;
 	    }
 	}
-- 
cgit