2 files changed, 19 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index a2e592005d..9e9879ca3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug  6 01:28:53 2009  Tanaka Akira  <akr@fsij.org>
+
+	* eval.c (rb_thread_schedule): fix condition for making thread
+	  runnable.  [ruby-core:23515]
+
 Wed Aug  5 12:54:00 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_exc_raise, rb_exc_fatal): require exception object.
diff --git a/eval.c b/eval.c
index 699cf8020d..5094e7e3a0 100644
--- a/eval.c
+++ b/eval.c
@@ -11386,25 +11386,26 @@ rb_thread_schedule()
 	}
 	if ((th->status == THREAD_RUNNABLE || th == th_found) && th->stk_ptr) {
 	    if (!next || next->priority < th->priority) {
-                if (th == th_found) {
-                    th_found->status = THREAD_RUNNABLE;
-                    th_found->wait_for = 0;
-                    if (th->wait_for&WAIT_FD) {
-                        th_found->fd = 0;
-                    }
-                    else { /* th->wait_for&WAIT_SELECT */
-                        n = intersect_fds(&readfds, &th_found->readfds, max) +
-                            intersect_fds(&writefds, &th_found->writefds, max) +
-                            intersect_fds(&exceptfds, &th_found->exceptfds, max);
-                        th_found->select_value = n;
-                    }
-                }
 	        next = th;
             }
 	}
     }
     END_FOREACH_FROM(curr, th);
 
+    if (found && next == th_found) {
+        th_found->status = THREAD_RUNNABLE;
+        if (th->wait_for&WAIT_FD) {
+            th_found->fd = 0;
+        }
+        else { /* th->wait_for&WAIT_SELECT */
+            n = intersect_fds(&readfds, &th_found->readfds, max) +
+                intersect_fds(&writefds, &th_found->writefds, max) +
+                intersect_fds(&exceptfds, &th_found->exceptfds, max);
+            th_found->select_value = n;
+        }
+        th_found->wait_for = 0;
+    }
+
     if (!next) {
 	/* raise fatal error to main thread */
 	curr_thread->node = ruby_current_node;