*** empty log message ***

3 files changed, 46 insertions, 34 deletions

diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp
index 5e13765d86e..06f3a9e3013 100644
--- a/ace/WFMO_Reactor.cpp
+++ b/ace/WFMO_Reactor.cpp
@@ -1192,16 +1192,18 @@ ACE_WFMO_Reactor::complex_dispatch_handler (int index,
     this->handler_rep_.current_info ()[index];
   
   // Upcall
-  if (this->upcall (current_info.event_handler_,
-		    current_info.io_handle_, 
-		    event_handle,
-		    current_info.network_events_) == -1)
-    this->handler_rep_.unbind (event_handle, ACE_Event_Handler::ALL_EVENTS_MASK);
-  
+  ACE_Reactor_Mask problems = this->upcall (current_info.event_handler_,
+                                            current_info.io_handle_, 
+                                            event_handle,
+                                            current_info.network_events_);
+
+  if (problems != ACE_Event_Handler::NULL_MASK)
+    this->handler_rep_.unbind (event_handle, problems);  
+
   return 0;
 }
 
-int
+ACE_Reactor_Mask
 ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler,
 			  ACE_HANDLE io_handle, 
 			  ACE_HANDLE event_handle, 
@@ -1209,50 +1211,60 @@ ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler,
 {
   // This method figures out what exactly has happened to the socket
   // and then calls appropriate methods.
-  int result = 0;
+  ACE_Reactor_Mask problems = ACE_Event_Handler::NULL_MASK;
   WSANETWORKEVENTS events;
   
   if (::WSAEnumNetworkEvents ((SOCKET) io_handle,
 			      event_handle,
 			      &events) == SOCKET_ERROR)
-    return -1;
+    // Remove all masks
+    return ACE_Event_Handler::ALL_EVENTS_MASK;
   else
     {
       long actual_events = events.lNetworkEvents;
 
-      if (result != -1 && interested_events & actual_events & FD_READ)
-	result = event_handler->handle_input (io_handle);
+      if (interested_events & actual_events & FD_READ)
+	if (event_handler->handle_input (io_handle) == -1)
+          ACE_SET_BITS (problems, ACE_Event_Handler::READ_MASK);
 
-      if (result != -1 && interested_events & actual_events & FD_CLOSE)
-	result = event_handler->handle_input (io_handle);
+      if (interested_events & actual_events & FD_CLOSE)
+	if (event_handler->handle_input (io_handle) == -1)
+          ACE_SET_BITS (problems, ACE_Event_Handler::READ_MASK);
 
-      if (result != -1 && interested_events & actual_events & FD_WRITE)
-	result = event_handler->handle_output (io_handle);
+      if (interested_events & actual_events & FD_WRITE)
+	if (event_handler->handle_output (io_handle) == -1)
+          ACE_SET_BITS (problems, ACE_Event_Handler::WRITE_MASK);
 
-      if (result != -1 && interested_events & actual_events & FD_OOB)
-	result = event_handler->handle_exception (io_handle);
+      if (interested_events & actual_events & FD_OOB)
+	if (event_handler->handle_exception (io_handle) == -1)
+          ACE_SET_BITS (problems, ACE_Event_Handler::EXCEPT_MASK);
 
-      if (result != -1 && interested_events & actual_events & FD_ACCEPT)
-	result = event_handler->handle_input (io_handle);
+      if (interested_events & actual_events & FD_ACCEPT)
+	if (event_handler->handle_input (io_handle) == -1)
+          ACE_SET_BITS (problems, ACE_Event_Handler::ACCEPT_MASK);
       
-      if (result != -1 && interested_events & actual_events & FD_CONNECT)
+      if (interested_events & actual_events & FD_CONNECT)
 	{
 	  if (events.iErrorCode[FD_CONNECT_BIT] == 0)
 	    // Successful connect
-	    result = event_handler->handle_output (io_handle);
+	    if (event_handler->handle_output (io_handle) == -1)
+              ACE_SET_BITS (problems, ACE_Event_Handler::CONNECT_MASK);
 	  else
 	    // Unsuccessful connect
-	    result = event_handler->handle_input (io_handle);
+	    if (event_handler->handle_input (io_handle) == -1)
+              ACE_SET_BITS (problems, ACE_Event_Handler::CONNECT_MASK);
 	}
       
-      if (result != -1 && interested_events & actual_events & FD_QOS)
-	result = event_handler->handle_qos (io_handle);
+      if (interested_events & actual_events & FD_QOS)
+	if (event_handler->handle_qos (io_handle) == -1)
+          ACE_SET_BITS (problems, ACE_Event_Handler::QOS_MASK);
       
-      if (result != -1 && interested_events & actual_events & FD_GROUP_QOS)
-	result = event_handler->handle_group_qos (io_handle);
+      if (interested_events & actual_events & FD_GROUP_QOS)
+	if (event_handler->handle_group_qos (io_handle) == -1)
+          ACE_SET_BITS (problems, ACE_Event_Handler::GROUP_QOS_MASK);
     }
 
-  return result;
+  return problems;
 }
 
 int 
diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h
index c0bef5d74c0..e9f8ef8bd11 100644
--- a/ace/WFMO_Reactor.h
+++ b/ace/WFMO_Reactor.h
@@ -908,10 +908,10 @@ protected:
   // Dispatches a single handler.  Returns 0 on success, -1 if the
   // handler was removed.
 
-  virtual int upcall (ACE_Event_Handler *event_handler,
-		      ACE_HANDLE io_handle,
-		      ACE_HANDLE event_handle,
-		      long interested_events);
+  virtual ACE_Reactor_Mask upcall (ACE_Event_Handler *event_handler,
+                                   ACE_HANDLE io_handle,
+                                   ACE_HANDLE event_handle,
+                                   long interested_events);
 
   virtual int calculate_timeout (ACE_Time_Value *time);
   // Used to caluculate the next timeout
diff --git a/ace/WFMO_Reactor.i b/ace/WFMO_Reactor.i
index 4860087bc6b..10af5633240 100644
--- a/ace/WFMO_Reactor.i
+++ b/ace/WFMO_Reactor.i
@@ -282,9 +282,9 @@ ACE_INLINE int
 ACE_WFMO_Reactor_Handler_Repository::changes_required (void)
 {
   // Check if handles have be scheduled for additions or removal
-  return this->handles_to_be_added_ > 0     ||
-    this->handles_to_be_deleted_ > 0   ||
-    this->handles_to_be_suspended_ > 0 ||
+  return this->handles_to_be_added_ > 0 ||
+    this->handles_to_be_deleted_ > 0    ||
+    this->handles_to_be_suspended_ > 0  ||
     this->handles_to_be_resumed_ > 0;
 }