summaryrefslogtreecommitdiff
path: root/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp')
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
index 0f60191a9bd..e396d5603f6 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
@@ -35,7 +35,6 @@ AppHelper::create_poa(const char* name,
mgr,
policies
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableServer::POA::_nil ());
if (CORBA::is_nil(child_poa.in()))
{
@@ -54,13 +53,11 @@ AppHelper::activate_servant(PortableServer::POA_ptr poa,
ACE_ENV_ARG_DECL)
{
// Activate the servant using the Child POA.
- PortableServer::ObjectId_var oid
+ PortableServer::ObjectId_var oid
= poa->activate_object(servant ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
- CORBA::Object_var obj
+ CORBA::Object_var obj
= poa->servant_to_reference(servant ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
if (CORBA::is_nil(obj.in()))
{
@@ -84,11 +81,9 @@ AppHelper::validate_connection (CORBA::Object_ptr obj)
CORBA::PolicyList_var unused;
obj->_validate_connection (unused
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
#else
obj->_is_a ("Not_An_IDL_Type"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
#endif /* TAO_HAS_MESSAGING == 1 */
return true;
}