ChangeLogTag: Thu Jan 25 17:39:59 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

1 files changed, 21 insertions, 28 deletions

diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index a3fe6454fe1..c2f2049c714 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -34,7 +34,7 @@ TAO_Offer_Importer::perform_queries (void)
   policies.return_card (16*NUM_OFFERS);
   policies.link_follow_rule (CosTrading::always);
 
-  this->perform_queries_with_policies (policies ACE_ENV_ARG_PARAMETER);
+  this->perform_queries_with_policies (policies);
 }
 
 void
@@ -80,7 +80,7 @@ TAO_Offer_Importer::perform_directed_queries (void)
         }
 
       CosTrading::Link::LinkInfo_var link_info =
-        link_if->describe_link (link_name_seq[0u] ACE_ENV_ARG_PARAMETER);
+        link_if->describe_link (link_name_seq[0u]);
 
       CosTrading::Lookup_ptr lookup_if = link_info->target.in ();
       CosTrading::Link_var link_if2 = lookup_if->link_if ();
@@ -111,7 +111,7 @@ TAO_Offer_Importer::perform_directed_queries (void)
               policies.starting_trader (new CosTrading::TraderName
                                         (2, 2, trader_name, 1));
 
-              this->perform_queries_with_policies (policies ACE_ENV_ARG_PARAMETER);
+              this->perform_queries_with_policies (policies);
             }
         }
       else
@@ -131,7 +131,6 @@ TAO_Offer_Importer::perform_directed_queries (void)
 void
 TAO_Offer_Importer::perform_queries_with_policies (
     const TAO_Policy_Creator& policies
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
@@ -145,7 +144,7 @@ TAO_Offer_Importer::perform_queries_with_policies (
                    CosTrading::DuplicatePropertyName,
                    CosTrading::DuplicatePolicyName))
 {
-  ACE_TRY
+  try
     {
       CosTrading::Lookup::SpecifiedProps desired_props;
 
@@ -182,8 +181,7 @@ TAO_Offer_Importer::perform_queries_with_policies (
                                 8,
                                 offer_seq_out,
                                 offer_iterator_out,
-                                limits_applied_out
-                                ACE_ENV_ARG_PARAMETER);
+                                limits_applied_out);
 
           CosTrading::OfferSeq_var offer_seq (offer_seq_ptr);
           CosTrading::OfferIterator_var offer_iterator (offer_iterator_ptr);
@@ -193,8 +191,7 @@ TAO_Offer_Importer::perform_queries_with_policies (
             {
               ACE_DEBUG ((LM_DEBUG, "*** Results:\n\n"));
               this->display_results (*offer_seq_ptr,
-                                     offer_iterator_ptr
-                                     ACE_ENV_ARG_PARAMETER);
+                                     offer_iterator_ptr);
 
               if (limits_applied_out->length () > 0)
                 ACE_DEBUG ((LM_DEBUG, "*** Limits Applied:\n\n"));
@@ -208,21 +205,20 @@ TAO_Offer_Importer::perform_queries_with_policies (
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Importer::perform_queries");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Offer_Importer::perform_queries");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
-                                     CosTrading::OfferIterator_ptr offer_iterator
-                                     ACE_ENV_ARG_DECL) const
+                                     CosTrading::OfferIterator_ptr offer_iterator) const
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       CORBA::ULong length = 0, i = 0;
       ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
@@ -232,12 +228,11 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
         {
           // Call back to the exported object.
           TAO_Trader_Test::Remote_Output_var remote_output =
-            TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+            TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ());
 
           remote_output->confirm ();
 
-          TT_Info::dump_properties (offer_seq[i].properties, 1 ACE_ENV_ARG_PARAMETER);
+          TT_Info::dump_properties (offer_seq[i].properties, 1);
           ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
         }
 
@@ -254,21 +249,19 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
               CosTrading::OfferSeq_out iter_offers_out (iter_offers_ptr);
 
               any_left = offer_iterator->next_n (length,
-                                                 iter_offers_out
-                                                 ACE_ENV_ARG_PARAMETER);
+                                                 iter_offers_out);
 
               CosTrading::OfferSeq_var iter_offers (iter_offers_ptr);
               for (length = iter_offers->length (), i = 0; i < length; i++)
                 {
                   // Call back to the exported object.
                   TAO_Trader_Test::Remote_Output_var remote_output =
-                    TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ()
-                                                             ACE_ENV_ARG_PARAMETER);
+                    TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ());
 
                   remote_output->confirm ();
 
                   CosTrading::PropertySeq& props = iter_offers[i].properties;
-                  TT_Info::dump_properties (props, 1 ACE_ENV_ARG_PARAMETER);
+                  TT_Info::dump_properties (props, 1);
 
                   ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
                 }
@@ -278,10 +271,10 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
           offer_iterator->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Importer::display_results");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Offer_Importer::display_results");
+      throw;
     }
-  ACE_ENDTRY;
 }