diff options
author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-06 03:15:27 +0000 |
---|---|---|
committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-06 03:15:27 +0000 |
commit | 350e3f68f637b5745ee65da075aa83599068eae4 (patch) | |
tree | 2c2169750162d8434757e95d8d99a357c7b67cfe | |
parent | c9048fb8087541b0ae1245704cbaea29b3fb66ca (diff) | |
download | ATCD-350e3f68f637b5745ee65da075aa83599068eae4.tar.gz |
ChangeLogTag:Mon Mar 5 19:14:03 2001 Carlos O'Ryan <coryan@uci.edu>
-rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 28 | ||||
-rw-r--r-- | TAO/performance-tests/Callback/client.cpp | 4 | ||||
-rw-r--r-- | TAO/performance-tests/Callback/server.cpp | 4 | ||||
-rw-r--r-- | TAO/performance-tests/Latency/ami-latency-client.cpp | 4 | ||||
-rw-r--r-- | TAO/performance-tests/Latency/ami-throughput-client.cpp | 4 | ||||
-rw-r--r-- | TAO/performance-tests/Latency/server.cpp | 4 | ||||
-rw-r--r-- | TAO/performance-tests/Latency/st_server.cpp | 4 | ||||
-rw-r--r-- | TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/client.cpp | 4 | ||||
-rw-r--r-- | TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/server.cpp | 4 | ||||
-rw-r--r-- | TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp | 4 | ||||
-rw-r--r-- | TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp | 4 | ||||
-rw-r--r-- | TAO/tests/Faults/test_i.cpp | 17 | ||||
-rw-r--r-- | TAO/tests/MT_Client/simple-client.cpp | 1 | ||||
-rw-r--r-- | TAO/tests/OctetSeq/server.cpp | 4 | ||||
-rw-r--r-- | TAO/tests/Param_Test/server.cpp | 5 | ||||
-rw-r--r-- | TAO/tests/Timeout/server.cpp | 4 |
16 files changed, 71 insertions, 28 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index b76ba029c15..35d945e7029 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,11 +1,29 @@ +Mon Mar 5 19:14:03 2001 Carlos O'Ryan <coryan@uci.edu> + + * performance-tests/Callback/client.cpp: + * performance-tests/Callback/server.cpp: + * performance-tests/Latency/ami-latency-client.cpp: + * performance-tests/Latency/ami-throughput-client.cpp: + * performance-tests/Latency/server.cpp: + * performance-tests/Latency/st_server.cpp: + * performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/client.cpp: + * performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/server.cpp: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp: + * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp: + * tests/OctetSeq/server.cpp: + * tests/Param_Test/server.cpp: + * tests/Timeout/server.cpp: + * utils/nslist/nslist.cpp: + More ACE_TRY_ENV / resolve_initial_references() fixes. + Mon Mar 5 19:01:15 2001 Ossama Othman <ossama@uci.edu> - * tao/Dynamic.pidl: - * tao/Messaging.pidl: - * tao/Pollable.pidl: + * tao/Dynamic.pidl: + * tao/Messaging.pidl: + * tao/Pollable.pidl: - Removed backslashes from the comments in these files. Some - preprocessors complain about "multi-line" comments. + Removed backslashes from the comments in these files. Some + preprocessors complain about "multi-line" comments. Mon Mar 5 18:46:42 2001 Fuzz Master D <brunsch@uci.edu> diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp index 7fa2f0bbf5c..3229c2caae3 100644 --- a/TAO/performance-tests/Callback/client.cpp +++ b/TAO/performance-tests/Callback/client.cpp @@ -99,7 +99,9 @@ main (int argc, char *argv []) ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA"); + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), diff --git a/TAO/performance-tests/Callback/server.cpp b/TAO/performance-tests/Callback/server.cpp index ce935279557..29937d5b005 100644 --- a/TAO/performance-tests/Callback/server.cpp +++ b/TAO/performance-tests/Callback/server.cpp @@ -68,7 +68,9 @@ main (int argc, char *argv []) ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA"); + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), diff --git a/TAO/performance-tests/Latency/ami-latency-client.cpp b/TAO/performance-tests/Latency/ami-latency-client.cpp index 745ee3e4fa3..6b4349a464b 100644 --- a/TAO/performance-tests/Latency/ami-latency-client.cpp +++ b/TAO/performance-tests/Latency/ami-latency-client.cpp @@ -177,7 +177,9 @@ main (int argc, char *argv[]) // Activate POA to handle the call back. CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA"); + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), diff --git a/TAO/performance-tests/Latency/ami-throughput-client.cpp b/TAO/performance-tests/Latency/ami-throughput-client.cpp index 006e0e35af5..feec94f45c7 100644 --- a/TAO/performance-tests/Latency/ami-throughput-client.cpp +++ b/TAO/performance-tests/Latency/ami-throughput-client.cpp @@ -212,7 +212,9 @@ main (int argc, char *argv[]) // Activate POA to handle the call back. CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA"); + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), diff --git a/TAO/performance-tests/Latency/server.cpp b/TAO/performance-tests/Latency/server.cpp index 4c4399c83d5..196bea50a9d 100644 --- a/TAO/performance-tests/Latency/server.cpp +++ b/TAO/performance-tests/Latency/server.cpp @@ -103,7 +103,9 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA"); + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), diff --git a/TAO/performance-tests/Latency/st_server.cpp b/TAO/performance-tests/Latency/st_server.cpp index 846d2285586..dd3425aae53 100644 --- a/TAO/performance-tests/Latency/st_server.cpp +++ b/TAO/performance-tests/Latency/st_server.cpp @@ -74,7 +74,9 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA"); + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/client.cpp index b8ecfbc8c1f..59b3fdaf54f 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/client.cpp @@ -285,7 +285,9 @@ Client::svc (void) // Obtain PolicyCurrent. CORBA::Object_var policy_current_object = - orb_->resolve_initial_references ("PolicyCurrent"); + orb_->resolve_initial_references ("PolicyCurrent", + ACE_TRY_ENV); + ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (policy_current_object.in (), diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/server.cpp index fb2dfab937e..e367577edfd 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/server.cpp @@ -72,7 +72,9 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA"); + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp index ab07b2c59d5..139cf0b61c5 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp @@ -215,7 +215,9 @@ Server::svc (void) ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA"); + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp index 1d8ddbe45fb..5a413405212 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp @@ -63,7 +63,9 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA"); + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp index e0c4b248c75..211db55ba67 100644 --- a/TAO/tests/Faults/test_i.cpp +++ b/TAO/tests/Faults/test_i.cpp @@ -16,12 +16,10 @@ Callback_i::shutdown (CORBA::Boolean is_clean, if (is_clean == 0) { ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n%a")); + return; } - else - { - ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); - this->orb_->shutdown (0, ACE_TRY_ENV); - } + ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); + this->orb_->shutdown (0, ACE_TRY_ENV); } // **************************************************************** @@ -53,12 +51,11 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean, if (is_clean == 0) { ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown %a\n")); + return; } - else - { - ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); - this->orb_->shutdown (0, ACE_TRY_ENV); - } + + ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); + this->orb_->shutdown (0, ACE_TRY_ENV); } void diff --git a/TAO/tests/MT_Client/simple-client.cpp b/TAO/tests/MT_Client/simple-client.cpp index 9fe565b024a..891e0428847 100644 --- a/TAO/tests/MT_Client/simple-client.cpp +++ b/TAO/tests/MT_Client/simple-client.cpp @@ -82,6 +82,7 @@ main (int argc, char *argv[]) } server->shutdown (ACE_TRY_ENV); + ACE_TRY_ENV; } ACE_CATCHANY { diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp index 0ccc9a2fb08..3c6009fb55c 100644 --- a/TAO/tests/OctetSeq/server.cpp +++ b/TAO/tests/OctetSeq/server.cpp @@ -42,7 +42,9 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA"); + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp index 99418c47dd6..9b17bb15211 100644 --- a/TAO/tests/Param_Test/server.cpp +++ b/TAO/tests/Param_Test/server.cpp @@ -74,7 +74,10 @@ main (int argc, char *argv[]) // Get the Root POA - temp = orb_ptr->resolve_initial_references ("RootPOA"); + temp = orb_ptr->resolve_initial_references ("RootPOA", + ACE_TRY_ENV); + ACE_TRY_CHECK; + if (CORBA::is_nil (temp.in())) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Unable to get root poa reference.\n"), diff --git a/TAO/tests/Timeout/server.cpp b/TAO/tests/Timeout/server.cpp index 33e49416cdc..acdf5ddacbd 100644 --- a/TAO/tests/Timeout/server.cpp +++ b/TAO/tests/Timeout/server.cpp @@ -47,7 +47,9 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA"); + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), |