summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/ImplRepo
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/ImplRepo')
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp4
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp6
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp6
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp8
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp27
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp3
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp6
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_i.h6
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp4
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp26
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/client.cpp11
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/server.cpp4
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp44
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/server_i.h2
17 files changed, 40 insertions, 123 deletions
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
index b885f1b28ed..9de2488801a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
@@ -11,11 +11,9 @@ int main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var ns_obj =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (ns_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -25,7 +23,6 @@ int main (int argc, char *argv[])
CosNaming::NamingContext_var inc =
CosNaming::NamingContext::_narrow (ns_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (inc.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -37,7 +34,6 @@ int main (int argc, char *argv[])
name[0].id = CORBA::string_dup ("yourself");
inc->bind (name, ns_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Test Successful\n"));
}
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index 079c8e9b4e1..9633238aa85 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -64,8 +64,7 @@ Airplane_Client_i::get_planes (size_t count)
ACE_TRY
{
CORBA::String_var response =
- this->server_->get_plane (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->server_->get_plane ();
ACE_DEBUG ((LM_DEBUG, "Plane %d is %s\n", i, response.in ()));
}
@@ -112,7 +111,6 @@ Airplane_Client_i::init (int argc, char **argv)
this->argv_,
"internet"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Parse command line and verify parameters.
if (this->parse_args () == -1)
@@ -126,10 +124,8 @@ Airplane_Client_i::init (int argc, char **argv)
CORBA::Object_var server_object =
this->orb_->string_to_object (this->server_key_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->server_ = Paper_Airplane_Server::_narrow (server_object.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
index 90f93c31e54..3276aac194c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
@@ -5,8 +5,8 @@
#include "tao/debug.h"
#include "ace/OS_NS_time.h"
-ACE_RCSID (ImplRepo,
- airplane_i,
+ACE_RCSID (ImplRepo,
+ airplane_i,
"$Id$")
// Constructor
@@ -29,7 +29,7 @@ Airplane_i::~Airplane_i (void)
// Returns a random plane and page number
char *
-Airplane_i::get_plane (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Airplane_i::get_plane (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (TAO_debug_level)
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
index 10982838106..da4beedac2f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
@@ -48,7 +48,7 @@ public:
~Airplane_i (void);
/// Returns a random plane.
- virtual char *get_plane (ACE_ENV_SINGLE_ARG_DECL)
+ virtual char *get_plane (void)
ACE_THROW_SPEC ((CORBA::SystemException));
};
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
index 45f4bd9bca3..05d69d7f205 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
@@ -17,14 +17,12 @@ main (int argc, char *argv[])
ACE_TRY
{
int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (retval == -1)
return -1;
-
-
- retval = server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+
+
+ retval = server.run ();
ACE_DEBUG ((LM_DEBUG, "Paper Airplane Server says goodnight\n"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index 92ffd886c0f..46c5be55077 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -71,7 +71,6 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
{
// Initialize the ORB
this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Save pointers to the command line arguments
this->argc_ = argc;
@@ -87,16 +86,13 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
CORBA::Object_var obj =
this->orb_->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (obj.in ()));
// Narrow the object to a POA.
root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Get the POA_Manager.
- this->poa_manager_ = this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->poa_manager_ = this->root_poa_->the_POAManager ();
// We now need to create a POA with the persistent and user_id policies,
// since they are need for use with the Implementation Repository.
@@ -112,21 +108,18 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
policies[1] =
this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->airplane_poa_ =
this->root_poa_->create_POA (poa_name,
this->poa_manager_.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Creation of the new POA is over, so destroy the Policy_ptr's.
for (CORBA::ULong i = 0; i < policies.length (); ++i)
{
CORBA::Policy_ptr policy = policies[i];
- policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policy->destroy ();
}
ACE_NEW_RETURN (this->server_impl_, Airplane_i, -1);
@@ -137,22 +130,17 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
this->airplane_poa_->activate_object_with_id (server_id.in (),
this->server_impl_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
obj = this->airplane_poa_->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG, "The ImRified IOR is: <%s>\n", ior.in ()));
TAO_Root_POA* tmp_poa = dynamic_cast<TAO_Root_POA*>(airplane_poa_.in());
obj = tmp_poa->id_to_reference_i (server_id.in (), false ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var plain_ior =
this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG, "The plain IOR is: <%s>\n", plain_ior.in ()));
@@ -160,17 +148,13 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
// invoke indirectly using a simple object_key reference
// like "corbaloc::localhost:8888/airplane_server".
obj = this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
IORTable::Table_var adapter =
IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (adapter.in ()));
adapter->bind (poa_name, plain_ior.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->poa_manager_->activate ();
if (this->ior_output_file_)
{
@@ -185,13 +169,12 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
int
-Airplane_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
+Airplane_Server_i::run (void)
{
ACE_TRY
{
@@ -199,7 +182,6 @@ Airplane_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
ACE_Time_Value tvStart = ACE_OS::gettimeofday();
this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_Time_Value tvEnd = ACE_OS::gettimeofday();
@@ -216,7 +198,6 @@ Airplane_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
index 3b9a1b1131e..ea00f591a58 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
@@ -42,7 +42,7 @@ public:
int init (int argc, char **argv ACE_ENV_ARG_DECL);
/// Run the orb
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
private:
/// Parses the commandline arguments.
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index a92bf39e6c8..4335b7e83cb 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -104,7 +104,6 @@ Nestea_Client_i::init (int argc, char **argv)
this->argv_,
"internet"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Parse command line and verify parameters.
if (this->parse_args () == -1)
@@ -118,10 +117,8 @@ Nestea_Client_i::init (int argc, char **argv)
CORBA::Object_var server_object =
this->orb_->string_to_object (this->server_key_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->server_ = Nestea_Bookshelf::_narrow (server_object.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index 4706cf0304d..55793984a58 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -69,7 +69,7 @@ Nestea_i::crush (CORBA::Long cans
// Returns the number of cans in the bookshelf.
CORBA::Long
-Nestea_i::bookshelf_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Nestea_i::bookshelf_size (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (TAO_debug_level)
@@ -81,7 +81,7 @@ Nestea_i::bookshelf_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
// Returns comments about your collection.
char *
-Nestea_i::get_praise (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Nestea_i::get_praise (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (TAO_debug_level)
@@ -100,7 +100,7 @@ Nestea_i::get_praise (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-Nestea_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Nestea_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (TAO_debug_level)
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
index 3e9aa019ff6..baf6ef4d8a9 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
@@ -55,14 +55,14 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
/// Returns the number of cans in the bookshelf.
- virtual CORBA::Long bookshelf_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual CORBA::Long bookshelf_size (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Returns comments about your collection.
- virtual char *get_praise (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char *get_praise (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void shutdown(void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
/// Saves bookshelf data to a file.
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
index 51a8ec71ebe..34b63ca6ea7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
@@ -15,14 +15,12 @@ main (int argc, char *argv[])
ACE_TRY
{
int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (retval == -1)
return -1;
else
{
- server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server.run ();
}
}
ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index f3278167081..cffa76eae74 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -97,7 +97,6 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
{
// Initialize the ORB
this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Save pointers to the command line arguments
this->argc_ = argc;
@@ -113,14 +112,11 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
CORBA::Object_var obj =
this->orb_->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (obj.in ()));
this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->poa_manager_ = this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->poa_manager_ = this->root_poa_->the_POAManager ();
// We now need to create a POA with the persistent and user_id policies,
// since they are need for use with the Implementation Repository.
@@ -136,21 +132,18 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
policies[1] =
this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->nestea_poa_ =
this->root_poa_->create_POA (poa_name,
this->poa_manager_.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Creation of the new POA is over, so destroy the Policy_ptr's.
for (CORBA::ULong i = 0; i < policies.length (); ++i)
{
CORBA::Policy_ptr policy = policies[i];
- policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policy->destroy ();
}
ACE_NEW_RETURN (this->server_impl_,
@@ -163,36 +156,27 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
this->nestea_poa_->activate_object_with_id (server_id.in (),
this->server_impl_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
obj = this->nestea_poa_->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", ior.in ()));
TAO_Root_POA* tmp_poa = dynamic_cast<TAO_Root_POA*>(nestea_poa_.in());
obj = tmp_poa->id_to_reference_i (server_id.in (), false ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var rawior =
this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
obj = this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
IORTable::Table_var adapter =
IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (adapter.in ()));
adapter->bind (poa_name, rawior.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->poa_manager_->activate ();
if (this->ior_output_file_)
{
@@ -207,13 +191,12 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
int
-Nestea_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
+Nestea_Server_i::run (void)
{
int status = 0;
@@ -233,7 +216,6 @@ Nestea_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return status;
}
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
index ff3aee780de..a7e2e4e1aea 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
@@ -42,7 +42,7 @@ public:
int init (int argc, char **argv ACE_ENV_ARG_DECL);
/// Run the orb
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
private:
/// Parses the commandline arguments.
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
index f5e1e660533..38766d2d780 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
@@ -11,20 +11,15 @@ int main(int argc, char* argv[]) {
ACE_TRY_NEW_ENV
{
-
+
ORB_var orb = ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Object_var obj = orb->resolve_initial_references("Test" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
test_var test = test::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! is_nil(test.in()));
- Long n = test->get(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- Long m = test->get(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Long n = test->get();
+ Long m = test->get();
if (m == n + 1)
ACE_DEBUG((LM_DEBUG, "Client: All tests ran successfully.\n"));
else
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
index 769d8126ae4..c18c843e2d1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
@@ -11,14 +11,12 @@ main (int argc, char *argv[])
Server_i server;
int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (retval == -1)
return -1;
else
{
- server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server.run ();
}
}
ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
index 21edebb203f..622fec14c14 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
@@ -23,17 +23,13 @@ public:
}
virtual ~test_i () {
}
- virtual CORBA::Long get (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) {
+ virtual CORBA::Long get (void) ACE_THROW_SPEC ((CORBA::SystemException)) {
++n_;
CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
PortableServer::Current_var cur = PortableServer::Current::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
ACE_ASSERT(! CORBA::is_nil(cur.in()));
- PortableServer::POA_var poa = cur->get_POA(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
- CORBA::String_var poaname = poa->the_name(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
+ PortableServer::POA_var poa = cur->get_POA();
+ CORBA::String_var poaname = poa->the_name();
ACE_DEBUG((LM_DEBUG, "%s: get() %d\n", poaname.in(), n_));
return n_;
@@ -100,7 +96,6 @@ Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
ACE_TRY
{
this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int retval = this->parse_args (argc, argv);
if (retval != 0)
@@ -108,21 +103,16 @@ Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
CORBA::Object_var obj =
this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->root_poa_ =
PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil(this->root_poa_.in()));
PortableServer::POAManager_var poa_manager =
- this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->root_poa_->the_POAManager ();
obj = this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
IORTable::Table_var ior_table =
IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil(ior_table.in()));
// If -orbuseimr 1 is specified then all persistent poas will be
@@ -130,9 +120,7 @@ Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
CORBA::PolicyList policies (2);
policies.length (2);
policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
test_i* test_svt;
ACE_NEW_RETURN (test_svt, test_i(orb_.in()), -1);
@@ -152,26 +140,19 @@ Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->activate_object_with_id (server_id.in (), test_svt ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
TAO_Root_POA* tmp_poa = dynamic_cast<TAO_Root_POA*>(poa.in());
obj = tmp_poa->id_to_reference_i (server_id.in (), false ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior = this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ior_table->bind (name.c_str(), ior.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
- policies[0]->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- policies[1]->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[0]->destroy();
+ policies[1]->destroy();
}
ACE_CATCHANY
{
@@ -180,22 +161,19 @@ Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
int
-Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
+Server_i::run (void)
{
ACE_TRY
{
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 ();
// We have potentially lots of IORs, so just write out a simple text
// file that the run_test.pl can use to know we're done.
@@ -210,8 +188,7 @@ Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
this->server_name_.c_str(),
this->count_));
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
this->root_poa_->destroy(1, 1);
this->orb_->destroy();
@@ -223,7 +200,6 @@ Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
index 222b179634a..8e947b72b69 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
@@ -17,7 +17,7 @@ public:
int init (int argc, char **argv ACE_ENV_ARG_DECL);
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
private:
int parse_args (int argc, char* argv[]);
View Lorry Controller Status