diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-02 14:12:41 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-02 14:12:41 +0000 |
| commit | 050e4f078bdad66a3df6bdc7267b71d8b3320eb9 (patch) | |
| tree | 264e59021031e5a41ff10857549b58e9417c4014 /TAO/tao/RTPortableServer | |
| parent | 30172978dd2d880270a2665f3adcd9ad99c81bb7 (diff) | |
| download | ATCD-050e4f078bdad66a3df6bdc7267b71d8b3320eb9.tar.gz | |
Fri Feb 2 14:07:14 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/RTPortableServer')
| -rw-r--r-- | TAO/tao/RTPortableServer/RT_POA.cpp | 22 | ||||
| -rw-r--r-- | TAO/tao/RTPortableServer/RT_Policy_Validator.cpp | 3 |
2 files changed, 11 insertions, 14 deletions
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp index 32d8f6856d7..8d9b2027b4d 100644 --- a/TAO/tao/RTPortableServer/RT_POA.cpp +++ b/TAO/tao/RTPortableServer/RT_POA.cpp @@ -405,23 +405,21 @@ TAO_RT_POA::create_stub_object (const TAO::ObjectKey &object_key, error = 1; if (error) - ACE_THROW_RETURN (CORBA::INTERNAL ( - CORBA::SystemException::_tao_minor_code ( - TAO_MPROFILE_CREATION_ERROR, - 0), - CORBA::COMPLETED_NO), - 0); + throw ::CORBA::INTERNAL ( + CORBA::SystemException::_tao_minor_code ( + TAO_MPROFILE_CREATION_ERROR, + 0), + CORBA::COMPLETED_NO); // Make sure we have at least one profile. <mp> may end up being // empty if none of the acceptor endpoints have the right priority // for this object, for example. if (mprofile.profile_count () == 0) - ACE_THROW_RETURN (CORBA::BAD_PARAM ( - CORBA::SystemException::_tao_minor_code ( - TAO_MPROFILE_CREATION_ERROR, - 0), - CORBA::COMPLETED_NO), - 0); + throw ::CORBA::BAD_PARAM ( + CORBA::SystemException::_tao_minor_code ( + TAO_MPROFILE_CREATION_ERROR, + 0), + CORBA::COMPLETED_NO); return this->orb_core_.create_stub_object (mprofile, diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp index 59351f89c8d..08c4b896d8b 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp @@ -564,8 +564,7 @@ TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core, tp_manager.get_threadpool (thread_pool_id); if (thread_pool == 0) - ACE_THROW_RETURN (PortableServer::POA::InvalidPolicy (), - 0); + throw PortableServer::POA::InvalidPolicy (); return thread_pool; } |