diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-17 23:35:48 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-17 23:35:48 +0000 |
| commit | f594b65f3fa8afb58601b33f225413e41906be49 (patch) | |
| tree | f17013cfcf1fe5b69cccc2a9c2671c068b0bc5e7 | |
| parent | c503f033fc127fbb1b7585fe89547cfae44434bc (diff) | |
| download | ATCD-f594b65f3fa8afb58601b33f225413e41906be49.tar.gz | |
ChangeLogTag:Sat Mar 17 15:34:14 2001 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 12 | ||||
| -rw-r--r-- | TAO/tests/Big_Oneways/Coordinator.cpp | 7 | ||||
| -rw-r--r-- | TAO/tests/Big_Oneways/Session.cpp | 15 | ||||
| -rw-r--r-- | TAO/tests/Big_Oneways/Session.h | 2 | ||||
| -rwxr-xr-x | TAO/tests/Big_Oneways/run_test.pl | 2 |
5 files changed, 33 insertions, 5 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index ec5b3cab3ca..36a0e5af586 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,15 @@ +Sat Mar 17 15:34:14 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/Big_Oneways/Session.h: + * tests/Big_Oneways/Session.cpp: + Fixed signed/unsigned warnings + + * tests/Big_Oneways/Coordinator.cpp: + Print error messages in all exception cases + + * tests/Big_Oneways/run_test.pl: + Run 3 peers to cause failures. + Fri Mar 16 15:49:26 2001 Carlos O'Ryan <coryan@uci.edu> * tao/IIOP_Transport.cpp: diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp index aad2ac5f506..bde4ea74848 100644 --- a/TAO/tests/Big_Oneways/Coordinator.cpp +++ b/TAO/tests/Big_Oneways/Coordinator.cpp @@ -61,7 +61,12 @@ Coordinator::shutdown_all_peers (CORBA::Environment &ACE_TRY_ENV) (*i)->shutdown (ACE_TRY_ENV); ACE_TRY_CHECK; } - ACE_CATCHANY {} ACE_ENDTRY; + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Coordinator::shutdown, ignored"); + } + ACE_ENDTRY; } } diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp index ead4c7e652a..d923ad779f8 100644 --- a/TAO/tests/Big_Oneways/Session.cpp +++ b/TAO/tests/Big_Oneways/Session.cpp @@ -2,6 +2,7 @@ // $Id$ // #include "Session.h" +#include "tao/debug.h" ACE_RCSID(Big_Oneways, Session, "$Id$") @@ -131,7 +132,12 @@ Session::start (const Test::Session_List &other_sessions, this->active_thread_count_++; } } - ACE_CATCHANY {} ACE_ENDTRY; + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Session::start, ignored"); + } + ACE_ENDTRY; } if (this->active_thread_count_ != this->thread_count_) @@ -228,6 +234,11 @@ Session::terminate (CORBA::Boolean success, ACE_TRY_ENV); ACE_TRY_CHECK_EX(GLOBAL); } - ACE_CATCHANY {} ACE_ENDTRY; + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Session::terminate, ignored"); + } + ACE_ENDTRY; } diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h index 96c9afa5737..2ed4501a940 100644 --- a/TAO/tests/Big_Oneways/Session.h +++ b/TAO/tests/Big_Oneways/Session.h @@ -84,7 +84,7 @@ private: /// The number of threads currently running, when this reaches 0 the /// session destroys itself. - int active_thread_count_; + CORBA::ULong active_thread_count_; /// Number of messages expected CORBA::ULong expected_messages_; diff --git a/TAO/tests/Big_Oneways/run_test.pl b/TAO/tests/Big_Oneways/run_test.pl index 7981a0b5540..a272f7d976d 100755 --- a/TAO/tests/Big_Oneways/run_test.pl +++ b/TAO/tests/Big_Oneways/run_test.pl @@ -35,7 +35,7 @@ $CL3 = new PerlACE::Process ("client", " -k file://$iorfile"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; |