ChangeLogTag: Wed Aug 31 10:00:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

28 files changed, 57 insertions, 24 deletions

diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
index e166deb3279..5e355715826 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
@@ -42,11 +42,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   Notify_Service_Shutdown_Functor killer (notify_service);
   Service_Shutdown kill_contractor (killer);
-  
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY_NEW_ENV
     {
-      if (notify_service.init (argc, argv ACE_ENV_ARG_PARAMETER) == -1)
+      int result = notify_service.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+       if (result == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT("Failed to initialize the Notification Service.\n")),
                           1);
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index acdfa302cfb..e26d040133c 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -202,6 +202,8 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
                                                   initial_admin,
                                                   id
                                                   ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (-1);
+
           name = this->naming_->to_name (
             this->notify_channel_name_.c_str ()
             ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index deb2e022117..89602b0a901 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -426,6 +426,7 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
 
         // Notify the event channel...
         this->typed_event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
 
       } /* this->is_typed_ec */
     else
@@ -477,6 +478,7 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
 
   // Notify the event channel...
   this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
       } /* ! this->is_typed_ec */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
index 2dca79b6574..a3a48f68530 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
@@ -73,7 +73,6 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_pull_supplier (
     CORBA::SystemException,
     CosTypedEventChannelAdmin::InterfaceNotSupported
   ))
-
 {
   ACE_THROW_RETURN (CosTypedEventChannelAdmin::InterfaceNotSupported (), 0);
 }
@@ -91,6 +90,7 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier (
 {
   // Register the consumer uses_interface with the EC
   int result = this->typed_event_channel_->consumer_register_uses_interace (uses_interface ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
 
   if (result == -1)
     {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
index 004f939fc2d..a667b64c44a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
@@ -70,6 +70,7 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_push_consumer (
 
 {
   int result = this->typed_event_channel_->supplier_register_supported_interface (supported_interface ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
 
   if (result == -1)
     {
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
index bf9bd299ca1..d427ebe6dc2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
@@ -100,6 +100,8 @@ TAO_HomeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
                                                       this->repo_,
                                                       this->section_key_
                                                       ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
   ACE_TString holder;
   int status =
     this->repo_->config ()->get_string_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
index 66601159633..02e14e8859e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
@@ -325,6 +325,7 @@ TAO_Port_Utils<T>::create_entry (const char *id,
                                           version,
                                           sub_section
                                           ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (T::_nil ());
 
   const char *tmp =
     TAO_IFR_Service_Utils::reference_to_path (port_base_type);
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index 842b0381325..8536b46f3ed 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -133,8 +133,7 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySet (allowed_property_types,
                                        allowed_properties
-                                       ACE_ENV_ARG_PARAMETER),
-                      0);
+                                       ACE_ENV_ARG_PARAMETER), 0);
       ACE_TRY_CHECK;
 
       // Successful, store this in the products sequence.
@@ -185,8 +184,7 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr
       // New a TAO_PropertySet.
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySet (initial_properties
-                                       ACE_ENV_ARG_PARAMETER),
-                      0);
+                                       ACE_ENV_ARG_PARAMETER), 0);
       ACE_TRY_CHECK;
 
       // Successful, store this in the products sequence.
@@ -278,8 +276,7 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySetDef (allowed_property_types,
                                           allowed_property_defs
-                                          ACE_ENV_ARG_PARAMETER),
-                      0);
+                                          ACE_ENV_ARG_PARAMETER), 0);
       ACE_TRY_CHECK;
 
       // Successful, store this in the products sequence.
@@ -330,8 +327,7 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi
       // New a TAO_PropertySet using these lengths.
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySetDef (initial_property_defs
-                                          ACE_ENV_ARG_PARAMETER),
-                      0);
+                                          ACE_ENV_ARG_PARAMETER), 0);
       ACE_TRY_CHECK;
 
       // Successful, store this in the products sequence.
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 65f186f86dc..bad82045dbc 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -1476,11 +1476,10 @@ Test_Supplier::push (const RtecEventComm::EventSet& events
 
       if (this->message_count_ < 0)
         {
-          //this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-          //if (ACE_ENV_SINGLE_ARG_PARAMETER.exception () != 0) return;
           this->test_->shutdown_supplier (this->cookie_,
                                           this->consumer_proxy_.in ()
                                           ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
         }
       if (this->message_count_ % 2 == 0)
         {
diff --git a/TAO/orbsvcs/tests/Notify/Driver/main.cpp b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
index ce95555bac7..1ad6142c0d4 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
@@ -10,7 +10,10 @@ ACE_TMAIN (int argc, char *argv[])
 
   ACE_TRY_NEW_ENV
     {
-      if (driver.init (argc, argv ACE_ENV_ARG_PARAMETER) == -1)
+      int result = driver.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (result == -1)
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT("Failed to initialize the Notify Testing Driver.\n")),
                             1);
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index dd7c7618ad2..9a8d23a4996 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -156,6 +156,7 @@ Client_i::test_for_uto_from_utc (void)
     {
       CosTime::UTO_var UTO_server = this->clerk_->uto_from_utc (utc_struct
                                                                 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       TimeBase::InaccuracyT inaccuracy = utc_struct.inacchi;
       inaccuracy <<= 32;
@@ -424,6 +425,7 @@ Client_i::init (int argc, char **argv)
           this->clerk_ =
             CosTime::TimeService::_narrow (server_object.in ()
                                            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
                       "[CLIENT] Process/Thread Id : (%P/%t) Using the IOR provided\n"));
diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp
index d6bf79b566b..bb14170a683 100644
--- a/TAO/tao/AnyTypeCode/append.cpp
+++ b/TAO/tao/AnyTypeCode/append.cpp
@@ -1165,6 +1165,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
                                                    src,
                                                    dest
                                                    ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
     }
 
   if (retval == TAO::TRAVERSE_CONTINUE
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index 96bff70c7ef..9da0b4d001f 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -441,6 +441,7 @@ TAO_DynStruct_i::get_members_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
       safe_retval[i].id =
         CORBA::string_dup (unaliased_tc->member_name (i
                                                       ACE_ENV_ARG_PARAMETER));
+      ACE_CHECK_RETURN (0);
 
       // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
       // Set the flag so the caller can't destroy.
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index 0ef86d1b3c5..26e98dc7d0b 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -82,6 +82,8 @@ TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc
   CORBA::TypeCode_var unaliased_tc =
   TAO_DynAnyFactory::strip_alias (this->type_.in ()
                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
   CORBA::Any_var first_label =
     unaliased_tc->member_label (this->current_position_
                                 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
index 90c4733f5c2..526e79e1acf 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
@@ -223,6 +223,7 @@ namespace TAO
     ACE_ENV_ARG_DECL)
   {
     this->interceptor_list_.add_interceptor (interceptor ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
   }
 
   void
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
index a027ffd58a0..dbd38fd621c 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -32,8 +32,7 @@ TAO_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
                              thread_lock,
                              orb_core,
                              object_adapter
-                             ACE_ENV_ARG_PARAMETER),
-                    CORBA::NO_MEMORY ());
+                             ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
   return poa;
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
index 21fba88fcc9..5e40ac9785a 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
@@ -123,6 +123,7 @@ namespace TAO
       if (adapter != 0)
         {
           adapter->imr_notify_shutdown (this->poa_ ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
         }
     }
 
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
index 0e0e3fc5a7d..87cf5b4defe 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -49,8 +49,8 @@ namespace TAO
                                                !poa->allow_multiple_activations (),
                                                poa->is_persistent (),
                                                poa->orb_core().server_factory ()->active_object_map_creation_parameters ()
-                                               ACE_ENV_ARG_PARAMETER),
-                    CORBA::NO_MEMORY ());
+                                               ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ());
+      ACE_CHECK;
 
       // Give ownership of the new map to the auto pointer.  Note, that it
       // is important for the auto pointer to take ownership before
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
index b8e4d6d2ee2..51be9a65283 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
@@ -38,6 +38,7 @@ TAO_RT_Endpoint_Utils::policy (TAO_Cached_Policy_Type type,
           p->length (1);
           (*p)[0u] = rt_stub->TAO_Stub::get_cached_policy (type
                                                            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
 
       ACE_RE_THROW;
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
index af5d83c29fb..2f79523a96f 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -584,6 +584,8 @@ TAO_RT_Protocols_Hooks::rt_service_context (
           int status =
             this->get_thread_CORBA_priority (client_priority
                                              ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+
           if (status == -1)
             ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
 
@@ -747,6 +749,8 @@ TAO_RT_Protocols_Hooks::get_thread_CORBA_and_native_priority (
   int result =
     this->get_thread_native_priority (native_priority
                                       ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+
   if (result == -1)
     {
       return result;
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index 323102b8590..37e3c21b498 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -1545,6 +1545,7 @@ TAO_TypeCodeFactory_i::value_event_tc_common (
       CORBA::Boolean const valid_member =
         this->valid_content_type (member_tc
                                   ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (tc);
 
       if (!valid_member)
         {
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index 9d249379b58..4541f43613c 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -179,6 +179,8 @@ Policy_Verifier::verify_reference (Counter_ptr object,
 
       policy_var = object->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE
                                         ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
       if (Policy_Verifier::check_reference (policy_var.in (),
                                           "Unable to get Priority Banded Policy\n"))
         {
@@ -223,6 +225,8 @@ Policy_Verifier::verify_reference (Counter_ptr object,
         }
       policy_var = object->_get_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE
                                         ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
       if (Policy_Verifier::check_reference (policy_var.in (),
                                             "Unable to get Client Protocol Policy\n"))
         {
diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp
index c9040934c2a..5425b2e0ddd 100644
--- a/TAO/tests/MProfile_Connection_Timeout/client.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp
@@ -102,7 +102,7 @@ main (int argc, char *argv[])
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      ACE_TRY_CHECK;
 
       CORBA::PolicyCurrent_var policy_current =
         CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
index 3a3c88b6ecc..c3e0377bee6 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
@@ -109,11 +109,13 @@ MT_Object_Server::init (int argc,
 int
 MT_Object_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
+  int result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+
+  if (result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "NestedUpCalls_Server::run"),
                       -1);
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
index d68871fcc2d..47837342aaa 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
@@ -102,11 +102,14 @@ Object_B_Server::init (int argc,
 int
 Object_B_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
+  int result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+
+  if (result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Object_B_Server::run"),
                       -1);
-  ACE_CHECK_RETURN (-1);
+
   return 0;
 }
 
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.cpp b/TAO/tests/ORT/ServerRequestInterceptor.cpp
index 9d7fe90a67d..831c09fa69f 100644
--- a/TAO/tests/ORT/ServerRequestInterceptor.cpp
+++ b/TAO/tests/ORT/ServerRequestInterceptor.cpp
@@ -62,7 +62,7 @@ ServerRequestInterceptor::receive_request (
   ACE_TRY
     {
       poa = this->poa_current_->get_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      ACE_TRY_CHECK;
     }
   ACE_CATCH (PortableServer::Current::NoContext, ex)
     {
diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp
index 8de5aa8c65f..d3f78ece1b0 100644
--- a/TAO/tests/Policies/Manipulation.cpp
+++ b/TAO/tests/Policies/Manipulation.cpp
@@ -338,6 +338,7 @@ Manipulation::svc (void)
                                    policy_manager.in (),
                                    policy_current.in ()
                                    ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
index 76a58219cf4..a874f7d3121 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
@@ -137,6 +137,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server
       server->update_records (id,
                               record
                               ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
 
       // Grab timestamp again.
       ACE_hrtime_t now = ACE_OS::gethrtime ();