From b856f9bba5046cd457b59c790dd711e59eebd77d Mon Sep 17 00:00:00 2001 From: nanbor Date: Tue, 23 Jul 2002 22:17:53 +0000 Subject: ChangeLogTag:Tue Jul 23 17:15:31 2002 Nanbor Wang --- TAO/ChangeLog | 17 ++++++--- TAO/tao/PortableServer/Collocated_Object.cpp | 55 ++++++++++++---------------- 2 files changed, 35 insertions(+), 37 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d1283e9d539..767ca279bd6 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Jul 23 17:15:31 2002 Nanbor Wang + + * tao/PortableServer/Collocated_Object.cpp + (_non_existent,_get_component): Removed redundant useages of + ACE_TRY blocks. They were causing some warnings from Tru64 + compiler. + Tue Jul 23 16:20:39 2002 Steve Huston * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp (is_full_i): @@ -38,7 +45,7 @@ Tue Jul 23 12:28:08 2002 Ossama Othman Correct emulated exception macro usage error, i.e. "ACE_CHECK" instead of "ACE_TRY_CHECK". - + * orbsvcs/orbsvsc/LoadBalancing/LB_Random.h: Moved `CosLoadBalancingC.h' include ahead of @@ -58,7 +65,7 @@ Tue Jul 23 12:28:08 2002 Ossama Othman * orbsvcs/orbsvsc/Makefile.CosLoadBalancing: Makefile for the new load balancer. - + * orbsvcs/orbsvsc/Makefile.CosNaming: * orbsvcs/orbsvsc/Makefile.PortableGroup: @@ -142,7 +149,7 @@ Mon Jul 22 17:26:14 2002 Balachandran Natarajan * tests/Stack_Recursion/Test.idl: * tests/Stack_Recursion/client.cpp: * tests/Stack_Recursion/run_test.pl: Made some cosmetic fixes to - get the test to exhibit the crash properly. + get the test to exhibit the crash properly. Mon Jul 22 17:20:41 2002 Jeff Parsons @@ -171,10 +178,10 @@ Mon Jul 22 17:20:41 2002 Jeff Parsons Mon Jul 22 20:16:04 UTC 2002 Craig Rodrigues - * orbsvcs/orbsvcs/Makefile.PortableGroup: Add + * orbsvcs/orbsvcs/Makefile.PortableGroup: Add PG_Default_Property_Validator.cpp to list of files being built. * orbsvcs/tests/Miop/McastHello/Makefile: Add -lTAO_PortableGroup to - link line. Fix for TRU64 Unix build. + link line. Fix for TRU64 Unix build. Mon Jul 22 14:22:49 2002 Ossama Othman diff --git a/TAO/tao/PortableServer/Collocated_Object.cpp b/TAO/tao/PortableServer/Collocated_Object.cpp index 9de4341dbec..5b1d564586f 100644 --- a/TAO/tao/PortableServer/Collocated_Object.cpp +++ b/TAO/tao/PortableServer/Collocated_Object.cpp @@ -168,45 +168,36 @@ TAO_Collocated_Object::_get_component (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var _tao_retval (CORBA::Object::_nil ()); - ACE_TRY - { - // If the object is collocated then try locally.... - if (!this->_is_collocated ()) - return this->CORBA_Object::_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); + // If the object is collocated then try locally.... + if (!this->_is_collocated ()) + return this->CORBA_Object::_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_Stub *stub = this->_stubobj (); + TAO_Stub *stub = this->_stubobj (); - // Which collocation strategy should we use? - if (stub != 0 && - stub->servant_orb_var ()->orb_core () - ->get_collocation_strategy () == TAO_ORB_Core::THRU_POA) - { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + // Which collocation strategy should we use? + if (stub != 0 && + stub->servant_orb_var ()->orb_core () + ->get_collocation_strategy () == TAO_ORB_Core::THRU_POA) + { + TAO_Object_Adapter::Servant_Upcall servant_upcall ( stub->servant_orb_var ()->orb_core () ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall (this->_object_key (), - "_component", - forward_to.out () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - return servant_upcall.servant ()->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); - } + CORBA::Object_var forward_to; + servant_upcall.prepare_for_upcall (this->_object_key (), + "_component", + forward_to.out () + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (_tao_retval.retn ()); + return servant_upcall.servant ()->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); + } - // Direct collocation strategy is used. - if (this->servant_ != 0) - return this->servant_->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); + // Direct collocation strategy is used. + if (this->servant_ != 0) + return this->servant_->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); - // @@ Maybe we want to change this exception... - ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0); - } - ACE_CATCHANY - { - ACE_RE_THROW; - } - ACE_ENDTRY; - return _tao_retval._retn (); + // @@ Maybe we want to change this exception... + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval._retn ()); } #endif /* TAO_HAS_MINIMUM_CORBA */ -- cgit v1.2.1