1 files changed, 10 insertions, 22 deletions

diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
index 96a7b7c0b88..46c920b873d 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
@@ -25,66 +25,54 @@ Push_Iterator_Handler::~Push_Iterator_Handler (void)
 
 void
 Push_Iterator_Handler::register_callback
-  (const Web_Server::Metadata_Type &metadata
-   ACE_ENV_ARG_DECL)
+  (const Web_Server::Metadata_Type &metadata)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->callback_servant_->metadata (metadata);
 
   // This handler is no longer needed, so deactivate it.
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate ();
 }
 
 void
 Push_Iterator_Handler::run (int *request_count,
                             const char *pathname,
-                            Web_Server::Iterator_Factory_ptr factory
-                            ACE_ENV_ARG_DECL)
+                            Web_Server::Iterator_Factory_ptr factory)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result))
 {
   ACE_NEW_THROW_EX (this->callback_servant_,
                     Callback_i (request_count),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   // Pass ownership of the Callback servant to the POA.
   PortableServer::ServantBase_var tmp (this->callback_servant_);
 
   // Activate the Callback.
   this->callback_ =
-    this->callback_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->callback_servant_->_this ();
 
   // Activate this Reply Handler.
   this->ami_handler_ =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   // Register the client callback with the server asynchronously.
   factory->sendc_register_callback (this->ami_handler_.in (),
                                     pathname,
-                                    this->callback_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                    this->callback_.in ());
 }
 
 void
-Push_Iterator_Handler::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+Push_Iterator_Handler::deactivate (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the POA used when activating the Reply Handler object.
-  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var poa = this->_default_POA ();
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
   // Now deactivate the AMI_CallbackHandler object.
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (oid.in ());
 }