diff options
| author | mk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-02 08:19:08 +0000 |
|---|---|---|
| committer | mk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-02 08:19:08 +0000 |
| commit | f5227ddf8c36e6401b6c0d2934899520bffce0ce (patch) | |
| tree | 1441f10a8dc0af441c1dcc1950b6c5293a839af7 | |
| parent | b40043510dbea6b44d959724edaa026f83562fb0 (diff) | |
| download | ATCD-f5227ddf8c36e6401b6c0d2934899520bffce0ce.tar.gz | |
ChangeLogTag: Fri Mar 2 02:18:32 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 2 | ||||
| -rw-r--r-- | TAO/tests/AMI_Timeouts/client.cpp | 1 | ||||
| -rw-r--r-- | TAO/tests/AMI_Timeouts/server.cpp | 1 | ||||
| -rw-r--r-- | TAO/tests/AMI_Timeouts/timeout_client.cpp | 20 |
4 files changed, 18 insertions, 6 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 4f5535fffc0..00cfa1a94f0 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,6 +1,8 @@ Fri Mar 2 02:18:32 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> * tests/AMI_Timeouts/timeout_i.cpp: + * tests/AMI_Timeouts/server.cpp: + * tests/AMI_Timeouts/client.cpp: Fixed exception handling code. Fri Mar 2 02:15:32 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp index 052d2959f51..c0ef16ecec0 100644 --- a/TAO/tests/AMI_Timeouts/client.cpp +++ b/TAO/tests/AMI_Timeouts/client.cpp @@ -139,6 +139,7 @@ main (int argc, char *argv[]) return 1; } ACE_ENDTRY; + ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp index 750ada9fa90..9287570606a 100644 --- a/TAO/tests/AMI_Timeouts/server.cpp +++ b/TAO/tests/AMI_Timeouts/server.cpp @@ -140,6 +140,7 @@ main (int argc, char *argv[]) return 1; } ACE_ENDTRY; + ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp index 1531ff379ce..d7f7d6713ef 100644 --- a/TAO/tests/AMI_Timeouts/timeout_client.cpp +++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp @@ -83,6 +83,7 @@ TimeoutClient::svc () return 1; } ACE_ENDTRY; + ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "TimeoutClient::svc: Done\n\n")); @@ -111,6 +112,7 @@ TimeoutClient::init () return 1; } ACE_ENDTRY; + ACE_CHECK_RETURN (-1); return 0; } @@ -136,7 +138,10 @@ TimeoutClient::send (bool async, remote_sleep)); CORBA::PolicyList policy_list (1); - ACE_TRY_NEW_ENV + + CORBA::Environment ACE_TRY_ENV; + + ACE_TRY_EX (normal) { if (local_timeout != 0) { @@ -150,12 +155,12 @@ TimeoutClient::send (bool async, orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any_orb, ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_TRY_CHECK_EX (normal); policy_manager_->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE, ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_TRY_CHECK_EX (normal); } else { @@ -163,7 +168,7 @@ TimeoutClient::send (bool async, policy_manager_->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE, ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_TRY_CHECK_EX (normal); } @@ -181,7 +186,7 @@ TimeoutClient::send (bool async, timeoutObject_->sendTimeToWait (remote_sleep, ACE_TRY_ENV); } - + ACE_TRY_CHECK_EX (normal); } ACE_CATCH (CORBA::TIMEOUT, timeout) { @@ -193,13 +198,15 @@ TimeoutClient::send (bool async, } ACE_ENDTRY; + ACE_CHECK; // get rid of the policy, you created before. - ACE_TRY_NEW_ENV + ACE_TRY_EX (cleanup) { if (local_timeout != 0) { policy_list[0]->destroy (ACE_TRY_ENV); + ACE_TRY_CHECK_EX (cleanup); } } ACE_CATCHANY @@ -208,6 +215,7 @@ TimeoutClient::send (bool async, "Unexpected exception\n\n")); } ACE_ENDTRY; + ACE_CHECK; // wait for responses ACE_Time_Value tv (0, (local_timeout + remote_sleep)*2000); |