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

8 files changed, 61 insertions, 96 deletions

diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
index ab3ca193d29..a2ef5f64119 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
@@ -11,15 +11,13 @@
 #include "ReplicaController.h"
 
 void
-ORB_Initializer::pre_init (PortableInterceptor::ORBInitInfo_ptr
-                           ACE_ENV_ARG_DECL_NOT_USED)
+ORB_Initializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info
-                            ACE_ENV_ARG_DECL)
+ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate slot id.
@@ -49,6 +47,5 @@ ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info
     interceptor = tmp_interceptor;
   }
 
-  info->add_server_request_interceptor (interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (interceptor.in ());
 }
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
index d11b2a41aa2..219ef9fa590 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
@@ -15,13 +15,11 @@ class ORB_Initializer :
 public:
 
   virtual void
-  pre_init (PortableInterceptor::ORBInitInfo_ptr info
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void
-  post_init (PortableInterceptor::ORBInitInfo_ptr info
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
index 62da70797a9..0f39c065b71 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
@@ -54,26 +54,24 @@ get_state ()
 void Checkpointable::
 associate_state (CORBA::ORB_ptr orb, CORBA::Any const& state)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     CORBA::Object_var pic_obj =
-      orb->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER);
+      orb->resolve_initial_references ("PICurrent");
 
 
     PortableInterceptor::Current_var pic =
       PortableInterceptor::Current::_narrow (
-        pic_obj.in () ACE_ENV_ARG_PARAMETER);
+        pic_obj.in ());
 
 
-    pic->set_slot (state_slot_id (), state ACE_ENV_ARG_PARAMETER);
+    pic->set_slot (state_slot_id (), state);
 
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:");
+    ex._tao_print_exception ("Caught exception:");
   }
-  ACE_ENDTRY;
 }
 
 // ReplyLogger
@@ -89,21 +87,19 @@ ReplicaController::
 ReplicaController (CORBA::ORB_ptr orb)
     : orb_ (CORBA::ORB::_duplicate (orb))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     CORBA::Object_var poa_object =
-      orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+      orb_->resolve_initial_references ("RootPOA");
 
     root_poa_ = PortableServer::POA::_narrow (
-      poa_object.in () ACE_ENV_ARG_PARAMETER);
+      poa_object.in ());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:");
+    ex._tao_print_exception ("Caught exception:");
     ACE_OS::abort ();
   }
-  ACE_ENDTRY;
 
   // Generate member id
   ACE_Utils::UUID uuid;
@@ -220,21 +216,19 @@ namespace
 {
   FT::FTRequestServiceContext*
   extract_context (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
+    PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException));
 }
 
 #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
 void
 ReplicaController::tao_ft_interception_point (
   PortableInterceptor::ServerRequestInfo_ptr ri,
-  CORBA::OctetSeq_out ocs
-  ACE_ENV_ARG_DECL)
+  CORBA::OctetSeq_out ocs)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   FT::FTRequestServiceContext_var ftr (
-    extract_context (ri ACE_ENV_ARG_PARAMETER));
+    extract_context (ri));
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Received request from %s with rid %i\n",
@@ -264,12 +258,11 @@ ReplicaController::tao_ft_interception_point (
 
 void
 ReplicaController::send_reply (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FT::FTRequestServiceContext_var ftr (
-    extract_context (ri ACE_ENV_ARG_PARAMETER));
+    extract_context (ri));
 
 
   ACE_DEBUG ((LM_DEBUG,
@@ -430,13 +423,11 @@ ReplicaController::send_reply (
 namespace
 {
   FT::FTRequestServiceContext*
-  extract_context (PortableInterceptor::ServerRequestInfo_ptr ri
-                   ACE_ENV_ARG_DECL)
+  extract_context (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     IOP::ServiceContext_var svc =
-      ri->get_request_service_context (IOP::FT_REQUEST
-                                       ACE_ENV_ARG_PARAMETER);
+      ri->get_request_service_context (IOP::FT_REQUEST);
 
     TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()),
                       svc->context_data.length ());
@@ -446,7 +437,7 @@ namespace
     if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
     {
       //@@ what to throw?
-      ACE_THROW (CORBA::BAD_CONTEXT ());
+      throw CORBA::BAD_CONTEXT ();
     }
 
     cdr.reset_byte_order (static_cast<int> (byte_order));
@@ -474,7 +465,7 @@ namespace
     if (!cdr.good_bit ())
     {
       //@@ what to throw?
-      ACE_THROW (CORBA::UNKNOWN ());
+      throw CORBA::UNKNOWN ();
     }
 
     return req._retn ();
@@ -491,8 +482,7 @@ ReplicaController::name (void)
 
 void
 ReplicaController::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -500,8 +490,7 @@ ReplicaController::send_exception (
 
 void
 ReplicaController::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -515,8 +504,7 @@ ReplicaController::destroy (void)
 
 void
 ReplicaController::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -525,8 +513,7 @@ ReplicaController::receive_request_service_contexts (
 
 void
 ReplicaController::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
index 419e6694379..fe4e1aa1f86 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
@@ -51,43 +51,37 @@ public:
   virtual void
   tao_ft_interception_point (
     PortableInterceptor::ServerRequestInfo_ptr ri,
-    CORBA::OctetSeq_out ocs
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    CORBA::OctetSeq_out ocs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
 
   virtual void
   receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void
   receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void
   send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void
   send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void
   send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
index c1445dec04a..20d9f800e63 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
@@ -39,8 +39,7 @@ set_state (CORBA::Any const& state)
 
 
 CORBA::Short
-RolyPoly_i::number (char *&str
-                ACE_ENV_ARG_DECL_NOT_USED)
+RolyPoly_i::number (char *&str)
   ACE_THROW_SPEC ((CORBA::SystemException, RolyPoly::E))
 {
   CORBA::string_free (str);
@@ -68,5 +67,5 @@ RolyPoly_i::shutdown (void)
 {
   ACE_DEBUG ((LM_DEBUG, "Server is shutting down.\n"));
 
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
index 6056af89eb4..99cc4b79c68 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
@@ -28,7 +28,7 @@ public:
   // RolyPoly
   //
   virtual CORBA::Short
-  number (char *&s ACE_ENV_ARG_DECL)
+  number (char *&s)
     ACE_THROW_SPEC ((CORBA::SystemException, RolyPoly::E));
 
   virtual void
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
index 26f0113ffc4..9a92f7672b7 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
@@ -55,13 +55,11 @@ main (int argc, char *argv[])
 {
   int status = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Client ORB"
-                                            ACE_ENV_ARG_PARAMETER);
+                                            "Client ORB");
 
       if (::parse_args (argc, argv) != 0) return -1;
 
@@ -98,17 +96,16 @@ main (int argc, char *argv[])
         CORBA::Object_var object_primary;
 
         object_primary =
-          orb->string_to_object (ior->c_str() ACE_ENV_ARG_PARAMETER);
+          orb->string_to_object (ior->c_str());
 
 
         // Get an object reference for the ORBs IORManipultion object!
         CORBA::Object_ptr IORM =
           orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                           0
-                                           ACE_ENV_ARG_PARAMETER);
+                                           0);
 
         TAO_IOP::TAO_IOR_Manipulation_ptr iorm =
-          TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER);
+          TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM);
 
 
         // Create the list
@@ -123,13 +120,13 @@ main (int argc, char *argv[])
             ior_iter.next (ior);
             ACE_DEBUG ((LM_DEBUG, "IOR%d: %s\n",cntr, ior->c_str ()));
             iors [cntr] =
-              orb->string_to_object (ior->c_str() ACE_ENV_ARG_PARAMETER);
+              orb->string_to_object (ior->c_str());
 
           }
 
         ACE_DEBUG ((LM_DEBUG, "Prepare to merge IORs.\n"));
         // Create a merged set 1;
-        object = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
+        object = iorm->merge_iors (iors);
 
 
 
@@ -157,13 +154,11 @@ main (int argc, char *argv[])
 
         // Set the property
         CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                                    object.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                    object.in ());
 
         retval = iorm->set_primary (&iogr_prop,
                                     object_primary.in (),
-                                    object.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+                                    object.in ());
 
       }
       else
@@ -173,11 +168,11 @@ main (int argc, char *argv[])
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to extract the only IOR string\n"),
                             -1);
-        object = orb->string_to_object (ior->c_str() ACE_ENV_ARG_PARAMETER);
+        object = orb->string_to_object (ior->c_str());
       }
 
       RolyPoly_var server =
-        RolyPoly::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        RolyPoly::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
       {
@@ -195,8 +190,7 @@ main (int argc, char *argv[])
 
         try
         {
-          number = server->number (str.inout ()
-                                   ACE_ENV_ARG_PARAMETER);
+          number = server->number (str.inout ());
         }
         catch (RolyPoly::E const& e)
         {
@@ -215,13 +209,12 @@ main (int argc, char *argv[])
 
       server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
index 6ee21282f1b..abe5e41242a 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
@@ -42,8 +42,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (::parse_args (argc, argv) != 0) return -1;
 
@@ -55,14 +54,13 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "Server ORB");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -70,7 +68,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -89,7 +87,7 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies;  // Empty policy list.
 
       CORBA::String_var ior =
-        orb->object_to_string (t.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (t.in ());
 
       poa_manager->activate ();
 
@@ -111,19 +109,18 @@ main (int argc, char *argv[])
       // Run the ORB event loop.
       orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }