diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2002-03-06 13:34:45 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2002-03-06 13:34:45 +0000 |
| commit | 451110fd71b2ef81b501c3b82f50079ec513f341 (patch) | |
| tree | e8dcc9d2d290fe32155d76dfe4cd3ccbebabf29c | |
| parent | 9ad4bfe7e5d61829c072bafefab0f8a54c6e75d8 (diff) | |
| download | ATCD-451110fd71b2ef81b501c3b82f50079ec513f341.tar.gz | |
ChangeLogTag: Wed Mar 06 14:29:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
| -rw-r--r-- | tests/MEM_Stream_Test.cpp | 7 |
4 files changed, 23 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index f1f7971bad3..a7c657dcda6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Mar 06 14:30:12 2002 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/MEM_Stream_Test.cpp: + Fixed the shutdown of this test. When _TEST_USES_THREADS is defined + we must do a wait() on the thread manager, else on the process + manager. + Tue Mar 05 20:34:22 2002 Ossama Othman <ossama@uci.edu> * ace/OS_Thread_Adapter.cpp (invoke): diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index f1f7971bad3..a7c657dcda6 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Tue Mar 06 14:30:12 2002 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/MEM_Stream_Test.cpp: + Fixed the shutdown of this test. When _TEST_USES_THREADS is defined + we must do a wait() on the thread manager, else on the process + manager. + Tue Mar 05 20:34:22 2002 Ossama Othman <ossama@uci.edu> * ace/OS_Thread_Adapter.cpp (invoke): diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index f1f7971bad3..a7c657dcda6 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Tue Mar 06 14:30:12 2002 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/MEM_Stream_Test.cpp: + Fixed the shutdown of this test. When _TEST_USES_THREADS is defined + we must do a wait() on the thread manager, else on the process + manager. + Tue Mar 05 20:34:22 2002 Ossama Othman <ossama@uci.edu> * ace/OS_Thread_Adapter.cpp (invoke): diff --git a/tests/MEM_Stream_Test.cpp b/tests/MEM_Stream_Test.cpp index dfc7bf0be24..77c4f6781d0 100644 --- a/tests/MEM_Stream_Test.cpp +++ b/tests/MEM_Stream_Test.cpp @@ -384,14 +384,11 @@ test_concurrent (const ACE_TCHAR *prog, ACE_DEBUG ((LM_DEBUG, "Reactor::run_event_loop finished\n")); #if defined (_TEST_USES_THREADS) -#else - ACE_Process_Manager::instance ()->wait (); - -#if defined (ACE_HAS_THREADS) // We need to call this method if we use the // ACE_Thread_Strategy<Echo_Handler>. ACE_Thread_Manager::instance ()->wait (); -#endif /* ACE_HAS_THREADS */ +#else + ACE_Process_Manager::instance ()->wait (); #endif /* _TEST_USES_THREADS */ if (acceptor.close () == -1) |