summaryrefslogtreecommitdiff
path: root/TAO/tests/Bug_1495_Regression
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Bug_1495_Regression')
-rw-r--r--TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp5
-rw-r--r--TAO/tests/Bug_1495_Regression/Client_Task.cpp3
-rw-r--r--TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Bug_1495_Regression/Server_Task.cpp12
-rw-r--r--TAO/tests/Bug_1495_Regression/Threaded_Client.cpp5
-rw-r--r--TAO/tests/Bug_1495_Regression/Threaded_Server.cpp18
-rw-r--r--TAO/tests/Bug_1495_Regression/client_interceptor.cpp4
-rw-r--r--TAO/tests/Bug_1495_Regression/client_interceptor.h4
-rw-r--r--TAO/tests/Bug_1495_Regression/server_interceptor.cpp10
-rw-r--r--TAO/tests/Bug_1495_Regression/server_interceptor.h4
-rw-r--r--TAO/tests/Bug_1495_Regression/test_i.cpp4
-rw-r--r--TAO/tests/Bug_1495_Regression/test_i.h2
12 files changed, 18 insertions, 55 deletions
diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
index fa080db4265..5a85d13a10f 100644
--- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
@@ -29,8 +29,7 @@ Client_ORBInitializer::post_init (
{
CORBA::String_var orb_id =
- info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ info->orb_id ();
PortableInterceptor::ClientRequestInterceptor_ptr interceptor =
PortableInterceptor::ClientRequestInterceptor::_nil ();
@@ -39,13 +38,11 @@ Client_ORBInitializer::post_init (
ACE_NEW_THROW_EX (interceptor,
Echo_Client_Request_Interceptor (orb_id.in ()),
CORBA::NO_MEMORY ());
- ACE_CHECK;
PortableInterceptor::ClientRequestInterceptor_var
client_interceptor = interceptor;
info->add_client_request_interceptor (client_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/tests/Bug_1495_Regression/Client_Task.cpp b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
index 51150d118a7..d4454dac1d2 100644
--- a/TAO/tests/Bug_1495_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
@@ -28,12 +28,10 @@ Client_Task::svc (void)
{
CORBA::Object_var object =
corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Bug1495_Regression::Bug1495_var server =
Bug1495_Regression::Bug1495::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server.in ()))
{
@@ -51,7 +49,6 @@ Client_Task::svc (void)
CORBA::Long remote_thread_id;
server->get_thread_id (remote_thread_id ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_INFO,
"Remote thread ID was %i\n",
diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
index 9993a624d7f..103c5aee788 100644
--- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
@@ -31,14 +31,12 @@ Server_ORBInitializer::post_init (
ACE_NEW_THROW_EX (this->server_interceptor_,
Echo_Server_Request_Interceptor,
CORBA::NO_MEMORY ());
- ACE_CHECK;
PortableInterceptor::ServerRequestInterceptor_var interceptor =
this->server_interceptor_;
info->add_server_request_interceptor (interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
Echo_Server_Request_Interceptor *
diff --git a/TAO/tests/Bug_1495_Regression/Server_Task.cpp b/TAO/tests/Bug_1495_Regression/Server_Task.cpp
index acaf0e35779..97046329a4b 100644
--- a/TAO/tests/Bug_1495_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1495_Regression/Server_Task.cpp
@@ -35,7 +35,6 @@ Server_Task::svc (void)
{
CORBA::Object_var poa_object =
sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
{
@@ -46,14 +45,11 @@ Server_Task::svc (void)
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
Bug1495_i *server_impl = 0;
ACE_NEW_RETURN (server_impl,
@@ -66,7 +62,6 @@ Server_Task::svc (void)
CORBA::String_var ior = sorb_->object_to_string (bug1495.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (output_ != 0)
{
@@ -94,13 +89,11 @@ Server_Task::svc (void)
// The ORB will run for 15 seconds and shut down.
ACE_Time_Value tv (15, 0);
sorb_->run (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Event loop finished for the thread server.\n"));
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -109,7 +102,6 @@ Server_Task::svc (void)
return 1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (1);
return 0;
}
diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp
index 99bb3239dfc..46172fabcaa 100644
--- a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp
+++ b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp
@@ -74,7 +74,6 @@ main (int argc, char *argv[])
main_args_s.get_TCHAR_argv (),
"Server_ORB"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_Manual_Event me;
@@ -99,7 +98,6 @@ main (int argc, char *argv[])
main_args_c.get_TCHAR_argv (),
"Client_ORB"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
{
Client_Task client_task (ior_input_file,
@@ -115,8 +113,7 @@ main (int argc, char *argv[])
ACE_Thread_Manager::instance ()->wait ();
}
- corb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ corb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
index 95cd68db7e7..a42807639fc 100644
--- a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
+++ b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
@@ -60,16 +60,13 @@ main (int argc, char *argv[])
PortableInterceptor::register_orb_initializer (initializer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Now initialize the ORB.
CORBA::ORB_var orb = CORBA::ORB_init (argc, argv,
"Remote_Server_ORB" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
{
@@ -80,14 +77,11 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
if (parse_args (argc, argv) != 0)
{
@@ -109,7 +103,6 @@ main (int argc, char *argv[])
// Pull in the ior from the remote server to use as the forward location.
CORBA::Object_var forward_location = orb->string_to_object (ior_input_file
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (forward_location.in ()))
{
@@ -121,27 +114,22 @@ main (int argc, char *argv[])
server_interceptor->forward_reference (forward_location.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Bug1495_i server_impl (orb.in ());
PortableServer::ObjectId_var id =
root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var test_obj =
root_poa->id_to_reference (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Bug1495_Regression::Bug1495_var server =
Bug1495_Regression::Bug1495::_narrow (test_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Output the server IOR to a file
if (ior_output_file != 0)
@@ -163,7 +151,6 @@ main (int argc, char *argv[])
ACE_Time_Value tv (15, 0);
orb->run (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (server_interceptor->forward_location_done() == false)
{
@@ -172,7 +159,6 @@ main (int argc, char *argv[])
ACE_DEBUG ((LM_DEBUG, "Threaded Server event loop finished \n"));
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
index fc019f046ed..cd5c24da242 100644
--- a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
+++ b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
@@ -24,14 +24,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
}
char *
-Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup (this->myname_);
}
void
-Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.h b/TAO/tests/Bug_1495_Regression/client_interceptor.h
index 2503a4b75b7..5ee9a220c42 100644
--- a/TAO/tests/Bug_1495_Regression/client_interceptor.h
+++ b/TAO/tests/Bug_1495_Regression/client_interceptor.h
@@ -31,11 +31,11 @@ public:
virtual ~Echo_Client_Request_Interceptor ();
// dtor.
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Canonical name of the interceptor.
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr
diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
index c4a32357087..545156c3359 100644
--- a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
+++ b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
@@ -43,14 +43,14 @@ Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo
}
char *
-Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup (this->myname_);
}
void
-Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -63,8 +63,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
PortableInterceptor::ForwardRequest))
{
- CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::String_var operation = ri->operation ();
ACE_DEBUG ((LM_DEBUG,
"%s.receive_request_service_contexts from "
@@ -131,8 +130,7 @@ Echo_Server_Request_Interceptor::send_other (
// This will throw an exception if a location forward has not
// occured. If an exception is thrown then something is wrong with
// the PortableInterceptor::ForwardRequest support.
- CORBA::Object_var forward = ri->forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::Object_var forward = ri->forward_reference ();
if (CORBA::is_nil (forward.in ()))
ACE_THROW (CORBA::INTERNAL ());
diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.h b/TAO/tests/Bug_1495_Regression/server_interceptor.h
index f1f682be9f9..874eb6a5f5b 100644
--- a/TAO/tests/Bug_1495_Regression/server_interceptor.h
+++ b/TAO/tests/Bug_1495_Regression/server_interceptor.h
@@ -37,11 +37,11 @@ public:
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Canonical name of the interceptor.
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
diff --git a/TAO/tests/Bug_1495_Regression/test_i.cpp b/TAO/tests/Bug_1495_Regression/test_i.cpp
index f79564cc0dd..0fba4bb193e 100644
--- a/TAO/tests/Bug_1495_Regression/test_i.cpp
+++ b/TAO/tests/Bug_1495_Regression/test_i.cpp
@@ -49,10 +49,8 @@ Bug1495_i::shutdown (
"Shutting down orb %i\n",
ACE_Thread::self()));
- this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_remove_ref ();
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/tests/Bug_1495_Regression/test_i.h b/TAO/tests/Bug_1495_Regression/test_i.h
index db21e2a6abb..7550249543c 100644
--- a/TAO/tests/Bug_1495_Regression/test_i.h
+++ b/TAO/tests/Bug_1495_Regression/test_i.h
@@ -54,7 +54,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
virtual
- void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
CORBA::ORB_ptr orb_;
View Lorry Controller Status