Changed ACE_NEW_TRY_ENV as ACE_TRY

1 files changed, 21 insertions, 13 deletions

diff --git a/TAO/examples/POA/Loader/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp
index 27f6fc0c746..2fb1ee10d7f 100644
--- a/TAO/examples/POA/Loader/Server_Manager.cpp
+++ b/TAO/examples/POA/Loader/Server_Manager.cpp
@@ -109,8 +109,8 @@ int
 Server_i::init (int argc, char **argv)
 {
   //CORBA::Environment TAO_TRY_ENV;
-
-  ACE_TRY_NEW_ENV
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
     {
       // Initialize the ORB.
       orb_ = CORBA::ORB_init (argc,
@@ -139,7 +139,7 @@ Server_i::init (int argc, char **argv)
     }
   ACE_CATCHANY 
     {
-      ACE_TRY_ENV.print_exception ("Server_i:init_poa ()");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i:init_poa ()");
       return 1;
     }
   ACE_ENDTRY;
@@ -157,8 +157,10 @@ Server_i::create_poa (const char *name,
 {
   // CORBA::Environment TAO_TRY_ENV;
   PortableServer::POA_ptr my_poa = 0;
- 
-  ACE_TRY_NEW_ENV
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  ACE_TRY
     {  
       policies_.length (4);
       
@@ -219,10 +221,11 @@ Server_i::create_poa (const char *name,
     }
   ACE_CATCHANY 
     {
-      ACE_TRY_ENV.print_exception ("Server_i:create_poa ()");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Server_i:create_poa ()");
       return 0;
     }
   ACE_ENDTRY;  
+  ACE_CHECK_RETURN (0);
 
   return my_poa;
 }
@@ -234,7 +237,9 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
 {
   // CORBA::Environment TAO_TRY_ENV;
    
-  ACE_TRY_NEW_ENV
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  ACE_TRY
     { 
       // An Servant Activator object is created which will activate
       // the servant on demand.
@@ -267,7 +272,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
     }
   ACE_CATCHANY 
     {
-      ACE_TRY_ENV.print_exception ("Server_i:create_activator ()");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Server_i:create_activator ()");
       return 1;
     }
   ACE_ENDTRY;  
@@ -281,8 +286,9 @@ int
 Server_i::create_locator (PortableServer::POA_var second_poa)
 {
   // CORBA::Environment TAO_TRY_ENV;
-   
-  ACE_TRY_NEW_ENV
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  ACE_TRY
     { 
       // An Servant Locator object is created which will activate 
       // the servant on demand.
@@ -317,7 +323,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
     }
   ACE_CATCHANY 
     {
-      ACE_TRY_ENV.print_exception ("Server_i:create_locator ()");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Server_i:create_locator ()");
       return 1;
     }
   ACE_ENDTRY;   
@@ -332,7 +338,9 @@ Server_i::run (void)
 {
   // CORBA::Environment TAO_TRY_ENV;
    
-  ACE_TRY_NEW_ENV
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  ACE_TRY
     { 
       // Invoke object_to_string on the references created in firstPOA
       // and secondPOA.
@@ -380,7 +388,7 @@ Server_i::run (void)
     }
   ACE_CATCHANY 
     {
-      ACE_TRY_ENV.print_exception ("Server_i:run ()");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Server_i:run ()");
       return 1;
     }
   ACE_ENDTRY;