diff --git a/ChangeLog b/ChangeLog
index 2c12d6188d..283b9bf740 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jun  6 11:42:15 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/thread.rb (Queue::pop): get rid of race condition.
+
 Tue Jun  4 18:28:37 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* ext/socket/extconf.rb: The IPv6 stack of Cygwin is still incomplete.
diff --git a/lib/thread.rb b/lib/thread.rb
index a398317461..7666bccecf 100644
--- a/lib/thread.rb
+++ b/lib/thread.rb
@@ -173,22 +173,14 @@ class Queue
   alias enq push
 
   def pop(non_block=false)
-    Thread.critical = true
-    begin
-      loop do
-       if @que.empty?
-	  if non_block
-	    raise ThreadError, "queue empty"
-	  end
-	  @waiting.push Thread.current
-	  Thread.stop
-	else
-	  return @que.shift
-	end
-      end
-    ensure
-      Thread.critical = false
+    while (Thread.critical = true; @que.empty?)
+      raise ThreadError, "queue empty" if non_block
+      @waiting.push Thread.current
+      Thread.stop
     end
+    @que.shift
+  ensure
+    Thread.critical = false
   end
   alias shift pop
   alias deq pop