diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-08-14 13:22:53 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-08-14 13:22:53 +0000 |
| commit | dc86f157173385d0035ef86b384af343bdc5b49a (patch) | |
| tree | 6af2d410242fcb44f7657730a6d218a5cefa1845 | |
| parent | b42e9d64e176866201f69c976530a508f164db7c (diff) | |
| download | ATCD-dc86f157173385d0035ef86b384af343bdc5b49a.tar.gz | |
ChangeLogTag: Thu Aug 14 13:21:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Event/Basic/Control.cpp | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 316bde9537b..1d8c1148a9a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Aug 14 13:22:19 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/tests/Event/Basic/Control.cpp: + Destroy the orb when ready. On our Solaris box this fixes the crashing + of this test. + Thu Aug 14 12:58:09 UTC 2003 Don Hinton <dhinton@dresystems.com> * TAO_IDL/fe/fe_tmplinst.cpp: diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp index b84226a540c..dd6efb09e13 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp @@ -80,9 +80,9 @@ main (int argc, char* argv[]) // **************************************************************** - Consumer consumer0 ("Consumer/0", 100); // Create a consumer, intialize its RT_Info structures, and // connnect to the event channel.... + Consumer consumer0 ("Consumer/0", 100); ACE_ConsumerQOS_Factory consumer_qos0; consumer_qos0.start_disjunction_group (); @@ -93,9 +93,9 @@ main (int argc, char* argv[]) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Consumer consumer1 ("Consumer/1", 200); // Create a consumer, intialize its RT_Info structures, and // connnect to the event channel.... + Consumer consumer1 ("Consumer/1", 200); consumer1.connect (consumer_admin.in (), consumer_qos0.get_ConsumerQOS () @@ -117,7 +117,6 @@ main (int argc, char* argv[]) ACE_Thread_Manager::instance ()->wait (); - // **************************************************************** // Cleanup.. @@ -146,6 +145,11 @@ main (int argc, char* argv[]) // **************************************************************** + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + // **************************************************************** + ACE_DEBUG ((LM_DEBUG, "Task 0 pushed %d events\n", task0.push_count ())); ACE_DEBUG ((LM_DEBUG, |