Mon Mar 12 21:15:46 UTC 2007 Carlos O'Ryan <coryan@atdeesk.com>

2 files changed, 22 insertions, 1 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index b53d26be098..a97f1359ccf 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,17 @@
+Mon Mar 12 21:15:46 UTC 2007  Carlos O'Ryan  <coryan@atdeesk.com>
+
+        * tests/Reactor_Notify_Test.cpp:
+          The test was verifying the behavior described in bug 2845.  I
+          neglected to fix the test when we fixed the bug.  Mostly because
+          I am stupid, but also because the test only worked as expected
+          in a limited number of builds.
+          This change should fix the test problems we are seeing on the
+          scoreboard, but the only thing I can say for sure is:
+          + I managed to reproduce the crash on my machine.
+          + I understand why the test was crashing.
+          + I believe the test was wrong and not the library.
+          + I fixed the test and now valgrind is happy with it.
+
 Mon Mar 12 17:55:18 UTC 2007  Steve Huston  <shuston@riverace.com>
 
         * ace/OS_NS_stdio.inl (vsnprintf): Back out the attempt to use the
diff --git a/ACE/tests/Reactor_Notify_Test.cpp b/ACE/tests/Reactor_Notify_Test.cpp
index a24bf4770a8..cd5f03971d2 100644
--- a/ACE/tests/Reactor_Notify_Test.cpp
+++ b/ACE/tests/Reactor_Notify_Test.cpp
@@ -433,7 +433,14 @@ run_notify_purge_test (void)
                   status));
     // Fifth test:
     r->notify (n2);
-    // <ap> destructor should cause n2's notify to be cancelled.
+
+    // The destructor of the event handler no longer removes the
+    // notifications.  It is the application's responsability to do
+    // so.
+    r->purge_pending_notifications(n2,
+				   ACE_Event_Handler::ALL_EVENTS_MASK);
+    r->purge_pending_notifications(&n1,
+				   ACE_Event_Handler::ALL_EVENTS_MASK);
   }
 
   ACE_Time_Value t (1);