Tue Mar 6 02:37:53 UTC 2007 Carlos O'Ryan <coryan@atdeesk.com>

1 files changed, 13 insertions, 0 deletions

diff --git a/ACE/ace/Select_Reactor_Base.cpp b/ACE/ace/Select_Reactor_Base.cpp
index 0306fc7007a..35896b41c09 100644
--- a/ACE/ace/Select_Reactor_Base.cpp
+++ b/ACE/ace/Select_Reactor_Base.cpp
@@ -640,6 +640,19 @@ ACE_Select_Reactor_Notify::close (void)
 
 #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
   notification_queue_.reset();
+#else
+  // Please see Bug 2820, if we just close the pipe then we break the
+  // reference counting rules.  Basically, all the event handlers
+  // "stored" in the pipe had their reference counts increased.  We
+  // need to decrease them before closing the pipe....
+  ACE_Notification_Buffer b;
+  for (int r = read_notify_pipe(notification_pipe_.read_handle(), b);
+       r > 0;
+       r = read_notify_pipe(notification_pipe_.read_handle(), b))
+    {
+      if (b.eh_ == 0) continue;
+      b.eh_->remove_reference();
+    }
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
   return this->notification_pipe_.close ();