ChangeLogTag: Mon Jan 8 17:58:46 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

2 files changed, 16 insertions, 5 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index e0620ae8388..0412b314429 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jan  8 17:58:46 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Bug_1890_Regression_Test.cpp:
+
+          Bug 1890 is specifically targeted for the Select Reactor.  So,
+          instead of relying on ACE_Reactor::instance() being an
+          ACE_Select_Reactor, explicitly use the ACE_Select_Reactor impl.
+          This will fix this test on Windows.
+
 Mon Jan  8 16:51:55 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
 
         * tests/Bug_2368_Regression_Test.cpp:
diff --git a/ACE/tests/Bug_1890_Regression_Test.cpp b/ACE/tests/Bug_1890_Regression_Test.cpp
index a28c8302b77..8a8cade4d90 100644
--- a/ACE/tests/Bug_1890_Regression_Test.cpp
+++ b/ACE/tests/Bug_1890_Regression_Test.cpp
@@ -14,7 +14,7 @@
 
 #include "ace/Pipe.h"
 #include "ace/Event_Handler.h"
-#include "ace/Reactor.h"
+#include "ace/Select_Reactor.h"
 
 ACE_RCSID (tests,
            Bug_1890_Regression_Test,
@@ -95,18 +95,19 @@ run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("Bug_1890_Regression_Test"));
 
-  ACE_Reactor * reactor = ACE_Reactor::instance();
+  ACE_Select_Reactor select_reactor;
+  ACE_Reactor reactor (&select_reactor);
 
   // Create the timer, this is the main driver for the test
   Timer * timer = new Timer;
 
   // Initialize the timer and register with the reactor
-  if (-1 == timer->open(reactor))
+  if (-1 == timer->open(&reactor))
   {
       ACE_ERROR_RETURN ((LM_ERROR, "Cannot initialize timer\n"), -1);
   }
 
-  reactor->run_reactor_event_loop();
+  reactor.run_reactor_event_loop();
 
   // Verify that the results are what we expect
   if (!timer->check_expected_results())
@@ -116,6 +117,7 @@ run_main (int, ACE_TCHAR *[])
 
   // Cleanup
   timer->close();
+  delete timer;
 
   ACE_END_TEST;
 
@@ -244,7 +246,7 @@ int Timer::handle_timeout(ACE_Time_Value const &, void const *)
       return 0;
     }
 
-    reactor()->end_event_loop();
+    reactor()->end_reactor_event_loop();
 
     return 0;
 }