2008-01-22 Joel Sherrill <joel.sherrill@OARcorp.com>

	* rtems/src/eventsurrender.c, rtems/src/ratemonperiod.c,
	score/src/threadqdequeue.c, score/src/threadqdequeuefifo.c,
	score/src/threadqdequeuepriority.c: Fix bugs encountered while
	testing and clean up more code.

1 files changed, 15 insertions, 1 deletions

diff --git a/cpukit/score/src/threadqdequeue.c b/cpukit/score/src/threadqdequeue.c
index 160bd6e84c..b9213968b8 100644
--- a/cpukit/score/src/threadqdequeue.c
+++ b/cpukit/score/src/threadqdequeue.c
@@ -48,11 +48,25 @@ Thread_Control *_Thread_queue_Dequeue(
 )
 {
   Thread_Control *(*dequeue_p)( Thread_queue_Control * );
+  Thread_Control *the_thread;
+  ISR_Level       level;
+  Thread_blocking_operation_States  sync_state;
 
   if ( the_thread_queue->discipline == THREAD_QUEUE_DISCIPLINE_PRIORITY )
     dequeue_p = _Thread_queue_Dequeue_priority;
   else /* must be THREAD_QUEUE_DISCIPLINE_FIFO */
     dequeue_p = _Thread_queue_Dequeue_fifo;
 
-  return (*dequeue_p)( the_thread_queue );
+  the_thread = (*dequeue_p)( the_thread_queue );
+  _ISR_Disable( level );
+    if ( !the_thread ) {
+      sync_state = the_thread_queue->sync_state;
+      if ( (sync_state == THREAD_BLOCKING_OPERATION_TIMEOUT) ||
+           (sync_state == THREAD_BLOCKING_OPERATION_NOTHING_HAPPENED) ) {
+        the_thread_queue->sync_state = THREAD_BLOCKING_OPERATION_SATISFIED;
+        the_thread = _Thread_Executing;
+      }
+    }
+  _ISR_Enable( level );
+  return the_thread;
 }