ChangeLogTag: Thu Feb 22 12:28:15 2001 Irfan Pyarali <irfan@cs.wustl.edu>

1 files changed, 8 insertions, 9 deletions

diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp
index 6957e50a8e9..300a0d1c135 100644
--- a/ace/TP_Reactor.cpp
+++ b/ace/TP_Reactor.cpp
@@ -87,22 +87,22 @@ ACE_TP_Reactor::handle_events (ACE_Time_Value *max_wait_time)
   // Update the countdown to reflect time waiting for the token.
   countdown.update ();
 
-  switch (result)
+  // Check for timeouts and errors.
+  if (result == -1)
     {
-    case 2:
-      ACE_MT (this->token_.release ());
-      return 0;
-    case -1:
       if (errno == ETIME)
         return 0;
-      return -1;
+      else
+        return -1;
     }
 
-  // After acquiring the lock, check if we have been deactivated.
+  // After acquiring the lock, check if we have been deactivated.  If
+  // we are deactivated, simply return without handling further
+  // events.
   if (this->deactivated_)
     {
       ACE_MT (this->token_.release ());
-      return -1;
+      return 0;
     }
 
   // We got the lock, lets handle some events.  Note: this method will
@@ -143,7 +143,6 @@ ACE_TP_Reactor::handle_events (ACE_Time_Value *max_wait_time)
     }
 
   return result;
-
 }
 
 int