diff options
Diffstat (limited to 'TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp')
| -rw-r--r-- | TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp index 71eb22f9d5b..27994af1f7b 100644 --- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp @@ -107,9 +107,9 @@ Server_i::write_iors_to_file (const char *first_ior, int Server_i::init (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + // CORBA::Environment TAO_TRY_ENV; - ACE_TRY + ACE_TRY_NEW_ENV { // Initialize the ORB. orb_ = CORBA::ORB_init (argc, @@ -154,10 +154,10 @@ PortableServer::POA_ptr Server_i::create_poa (const char *name, int servant_retention_policy) { + // CORBA::Environment TAO_TRY_ENV; PortableServer::POA_ptr my_poa = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + ACE_TRY_NEW_ENV { policies_.length (4); @@ -231,8 +231,9 @@ Server_i::create_poa (const char *name, int Server_i::create_activator (PortableServer::POA_var first_poa) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + // CORBA::Environment TAO_TRY_ENV; + + ACE_TRY_NEW_ENV { // An Servant Activator object is created which will activate // the servant on demand. @@ -279,8 +280,9 @@ Server_i::create_activator (PortableServer::POA_var first_poa) int Server_i::create_locator (PortableServer::POA_var second_poa) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + // CORBA::Environment TAO_TRY_ENV; + + ACE_TRY_NEW_ENV { // An Servant Locator object is created which will activate // the servant on demand. @@ -328,8 +330,9 @@ Server_i::create_locator (PortableServer::POA_var second_poa) int Server_i::run (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + // CORBA::Environment TAO_TRY_ENV; + + ACE_TRY_NEW_ENV { // Invoke object_to_string on the references created in firstPOA // and secondPOA. |