1 files changed, 7 insertions, 11 deletions
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
index 214b818cfd3..934865fbd92 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
@@ -18,8 +18,7 @@ ACE_RCSID (AMI_Iterator,
 void
 Iterator_Factory_i::get_iterator (const char *pathname,
                                   Web_Server::Content_Iterator_out contents,
-                                  Web_Server::Metadata_Type_out metadata
-                                  ACE_ENV_ARG_DECL)
+                                  Web_Server::Metadata_Type_out metadata)
   ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -29,48 +28,45 @@ Iterator_Factory_i::get_iterator (const char *pathname,
   ACE_stat file_status;
   if (ACE_OS::stat (pathname, &file_status) == -1)
     // HTTP 1.1 "Internal Server Error".
-    ACE_THROW (Web_Server::Error_Result (500));
+    throw Web_Server::Error_Result (500);
 
   Content_Iterator_i *iterator_servant = 0;
   ACE_NEW_THROW_EX (iterator_servant,
                     Content_Iterator_i (pathname,
                                         file_status.st_size),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   if (iterator_servant->init () != 0)
     {
       if (errno == EACCES)
         // HTTP 1.1 "Forbidden".
-        ACE_THROW (Web_Server::Error_Result (403));
+        throw Web_Server::Error_Result (403);
       else
         // HTTP 1.1 "Internal Server Error".
-        ACE_THROW (Web_Server::Error_Result (500));
+        throw Web_Server::Error_Result (500);
     }
 
 
   // Activate the Content_Iterator object.
   Web_Server::Content_Iterator_var iterator =
-    iterator_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    iterator_servant->_this ();
 
   Web_Server::Metadata_Type *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     Web_Server::Metadata_Type,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   metadata = tmp;
 
   if (this->modification_date (&file_status,
                                metadata) != 0)
     // HTTP 1.1 "Internal Server Error.
-    ACE_THROW (Web_Server::Error_Result (500));
+    throw Web_Server::Error_Result (500);
 
   if (this->content_type (pathname,
                           metadata) != 0)
     // HTTP 1.1 "Internal Server Error.
-    ACE_THROW (Web_Server::Error_Result (500));
+    throw Web_Server::Error_Result (500);
 
   contents = iterator._retn (); // Make a copy
 }