1 files changed, 10 insertions, 19 deletions

diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp
index ccd6466a93c..662e7bc2b09 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.cpp
+++ b/TAO/tests/DSI_Gateway/test_dsi.cpp
@@ -11,16 +11,13 @@
 ACE_RCSID(DSI_Gateway, test_dsi, "$Id$")
 
 void
-DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request
-                           ACE_ENV_ARG_DECL)
+DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::NVList_ptr list;
-  this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->create_list (0, list);
 
-  request->arguments (list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  request->arguments (list);
 
   CORBA::Request_var target_request;
 
@@ -31,22 +28,19 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request
                                   0, // exception_list,
                                   0, // context_list,
                                   target_request.inout (),
-                                  0
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  0);
 
   target_request->_tao_lazy_evaluation (1);
 
   // Outgoing request must have the same byte order as the incoming one.
   target_request->_tao_byte_order (request->_tao_incoming_byte_order ());
 
-  ACE_TRY
+  try
     {
       // Updates the byte order state, if necessary.
-      target_request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      target_request->invoke ();
     }
-  ACE_CATCH (CORBA::UNKNOWN, ex)
+  catch (const CORBA::UNKNOWN& ex)
     {
       ACE_UNUSED_ARG (ex);
 
@@ -57,29 +51,26 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request
 
       return;
     }
-  ACE_ENDTRY;
 
   // Outgoing reply must have the same byte order as the incoming one.
   request->_tao_reply_byte_order (target_request->_tao_byte_order ());
 
   if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0)
     {
-      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->shutdown (0);
     }
 }
 
 CORBA::RepositoryId
 DSI_Simple_Server::_primary_interface (const PortableServer::ObjectId &,
-                                       PortableServer::POA_ptr
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+                                       PortableServer::POA_ptr)
     ACE_THROW_SPEC (())
 {
   return CORBA::string_dup ("IDL:Simple_Server:1.0");
 }
 
 PortableServer::POA_ptr
-DSI_Simple_Server::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+DSI_Simple_Server::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }