Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 3 insertions, 18 deletions

diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp
index 8bf1e026102..6b72212aa3e 100644
--- a/TAO/tests/Bug_2319_Regression/server.cpp
+++ b/TAO/tests/Bug_2319_Regression/server.cpp
@@ -160,7 +160,6 @@ ST_AMH_Server::~ST_AMH_Server ()
   	ACE_TRY_NEW_ENV
     	{
       	this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      	ACE_TRY_CHECK;
     	}
   	ACE_CATCHANY
     	{
@@ -177,11 +176,9 @@ int ST_AMH_Server::start_orb_and_poa (const CORBA::ORB_var &_orb)
   ACE_TRY_NEW_ENV
     {
       this->orb_ = CORBA::ORB::_duplicate(_orb.in ());
-      ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
         this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -190,14 +187,11 @@ int ST_AMH_Server::start_orb_and_poa (const CORBA::ORB_var &_orb)
 
       this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->root_poa_->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
     }
   ACE_CATCHANY
     {
@@ -215,11 +209,9 @@ void ST_AMH_Server::register_servant (ST_AMH_Servant *servant)
 {
   ACE_TRY_NEW_ENV
     {
-      Test::Roundtrip_var roundtrip = servant->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test::Roundtrip_var roundtrip = servant->_this();
 
       CORBA::String_var iorstr = this->orb_->object_to_string(roundtrip.in ());
-      ACE_TRY_CHECK;
 
       (void) this->write_ior_to_file(iorstr);
     }
@@ -241,13 +233,11 @@ void ST_AMH_Server::run_event_loop ()
       while (1)
             {
           this->orb_->perform_work (&period);
-          ACE_TRY_CHECK;
 
           // when all calls from client have been recieved, exit
           if (calls_received == num_calls )
             return;
         }
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {}
@@ -299,7 +289,6 @@ Test::Timestamp time = 10;
         {
         roundtrip->test_method(time);
         ACE_DEBUG ((LM_DEBUG, "Sent call # %d \n", i));
-        ACE_TRY_CHECK;
         }
 
 	return 0;
@@ -316,7 +305,6 @@ int main (int argc, char *argv[])
 ST_AMH_Server amh_server (&argc, argv);
 CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
 
-      ACE_TRY_CHECK;
 
   	amh_server.start_orb_and_poa(orb);
 
@@ -325,10 +313,8 @@ ST_AMH_Servant servant(orb.in());
   	amh_server.register_servant(&servant);
 
     CORBA::Object_var object =  orb->string_to_object(ior);
-    ACE_TRY_CHECK;
 
     Test::Roundtrip_var roundtrip = Test::Roundtrip::_narrow(object.in ());
-    ACE_TRY_CHECK;
 
     if (CORBA::is_nil(roundtrip.in()))
       	{
@@ -359,7 +345,6 @@ ST_AMH_Servant servant(orb.in());
     printf("End server\n");
 
    	orb->destroy();
-   	ACE_TRY_CHECK;
 
     return 0;
 }