diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 15:39:09 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 15:39:09 +0000 |
| commit | c801f87e59c00f72bdeb5ce7bd0d276674665bac (patch) | |
| tree | 70bff03d1cf156ecf05ee4c5c338d8ce423e64ee /TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp | |
| parent | 98c0b37d4714ff774fc3ada8c9ee893c719af714 (diff) | |
| download | ATCD-c801f87e59c00f72bdeb5ce7bd0d276674665bac.tar.gz | |
Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index 830f8fe5e98..01e8fb523ea 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -591,7 +591,6 @@ TAO_AV_Core::get_acceptor (const char *flowname) { TAO_AV_AcceptorSetItor acceptor = this->acceptor_registry_->begin (); - ACE_TRY_CHECK; TAO_AV_AcceptorSetItor end = this->acceptor_registry_->end (); @@ -618,7 +617,6 @@ TAO_AV_Core::remove_acceptor (const char *flowname) { TAO_AV_AcceptorSetItor acceptor = this->acceptor_registry_->begin (); - ACE_TRY_CHECK; TAO_AV_AcceptorSetItor end = this->acceptor_registry_->end (); @@ -1134,16 +1132,13 @@ TAO_AV_Core::deactivate_servant (PortableServer::Servant servant) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - PortableServer::POA_var poa = servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableServer::POA_var poa = servant->_default_POA (); PortableServer::ObjectId_var id = poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -1151,7 +1146,6 @@ TAO_AV_Core::deactivate_servant (PortableServer::Servant servant) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } |