1 files changed, 15 insertions, 15 deletions

diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index f6d58ede385..440b4dbcd83 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -330,7 +330,7 @@ ECT_Throughput::run (int argc, char* argv[])
         ACE_TRY_CHECK;
         poa->deactivate_object (id.in (), ACE_TRY_ENV);
         ACE_TRY_CHECK;
-
+        
         ACE_DEBUG ((LM_DEBUG, "scheduler deactivated\n"));
       }
     }
@@ -350,7 +350,7 @@ ECT_Throughput::run (int argc, char* argv[])
 
 void
 ECT_Throughput::shutdown_consumer (void*,
-                                   CORBA::Environment &)
+                                   CORBA::Environment &ACE_TRY_ENV)
 {
   // int ID =
   //   (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie)
@@ -364,7 +364,7 @@ ECT_Throughput::shutdown_consumer (void*,
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%t) shutting down the ORB\n"));
-      // Not needed: this->orb_->shutdown (0, ACE_TRY_ENV);
+      // Not needed: this->orb_->shutdown ();
     }
 }
 
@@ -372,7 +372,7 @@ void
 ECT_Throughput::connect_consumers
      (RtecScheduler::Scheduler_ptr scheduler,
       RtecEventChannelAdmin::EventChannel_ptr channel,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::Environment &TAO_IN_ENV)
 {
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
@@ -396,8 +396,8 @@ ECT_Throughput::connect_consumers
                                     start,
                                     this->consumer_type_count_,
                                     channel,
-                                    ACE_TRY_ENV);
-      ACE_CHECK;
+                                    TAO_IN_ENV);
+      if (TAO_IN_ENV.exception () != 0) return;
     }
 }
 
@@ -405,7 +405,7 @@ void
 ECT_Throughput::connect_suppliers
      (RtecScheduler::Scheduler_ptr scheduler,
       RtecEventChannelAdmin::EventChannel_ptr channel,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -424,8 +424,8 @@ ECT_Throughput::connect_suppliers
                                     start,
                                     this->supplier_type_count_,
                                     channel,
-                                    ACE_TRY_ENV);
-      ACE_CHECK;
+                                    TAO_IN_ENV);
+      if (TAO_IN_ENV.exception () != 0) return;
     }
 }
 
@@ -449,22 +449,22 @@ ECT_Throughput::activate_suppliers (CORBA::Environment &)
 }
 
 void
-ECT_Throughput::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
+ECT_Throughput::disconnect_suppliers (CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->disconnect (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->suppliers_[i]->disconnect (TAO_IN_ENV);
+      if (TAO_IN_ENV.exception () != 0) return;
     }
 }
 
 void
-ECT_Throughput::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
+ECT_Throughput::disconnect_consumers (CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->disconnect (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->consumers_[i]->disconnect (TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }