diff options
Diffstat (limited to 'TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp')
| -rw-r--r-- | TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp index 2727c975253..8c06ff82ee9 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp @@ -19,7 +19,7 @@ ServantList<T>::~ServantList() template <typename T> void ServantList<T>::create_and_activate(unsigned num_servants, - CORBA::ORB_ptr orb, + CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, const char* ior_fname_prefix ACE_ENV_ARG_DECL) @@ -28,22 +28,19 @@ ServantList<T>::create_and_activate(unsigned num_servants, { char buf[32]; ACE_OS::sprintf(buf, "%02d", i + 1); - ACE_CString filename = ACE_CString(ior_fname_prefix) + "_" + buf + ".ior"; + ACE_CString filename = ACE_CString(ior_fname_prefix) + "_" + buf + ".ior"; ServantRecord record; record.servant_ = new T(); record.safe_servant_ = record.servant_; - CORBA::Object_var obj - = AppHelper::activate_servant(poa, + CORBA::Object_var obj + = AppHelper::activate_servant(poa, record.safe_servant_.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - AppHelper::ref_to_file(orb, obj.in(), filename.c_str() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + + AppHelper::ref_to_file(orb, obj.in(), filename.c_str() ACE_ENV_ARG_PARAMETER); record.obj_ = T_stub::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil(record.obj_.in())) { @@ -67,14 +64,12 @@ ServantList<T>::create_and_activate(unsigned num_servants, record.servant_ = new T(); record.safe_servant_ = record.servant_; - CORBA::Object_var obj - = AppHelper::activate_servant(poa, + CORBA::Object_var obj + = AppHelper::activate_servant(poa, record.safe_servant_.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - + record.obj_ = T_stub::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil(record.obj_.in())) { @@ -98,10 +93,8 @@ ServantList<T>::deactivate(PortableServer::POA_ptr poa) { PortableServer::ObjectId_var id = poa->servant_to_id(record.safe_servant_.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; poa->deactivate_object(id.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } ACE_CATCHANY { @@ -114,7 +107,6 @@ ServantList<T>::deactivate(PortableServer::POA_ptr poa) "Caught unknown exception \n")); } ACE_ENDTRY; - ACE_CHECK; } #endif |