diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-12-23 20:15:09 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-12-23 20:15:09 +0000 |
| commit | 0fccfbbe445a9a25a03fb1fb6f10a9faa5606e02 (patch) | |
| tree | 2c4ec8075b1a4d29191f49986fa949c390d51994 | |
| parent | 57a45acd72d32b9de32e3ee7a91fdbbf7a8ea5c4 (diff) | |
| download | ATCD-0fccfbbe445a9a25a03fb1fb6f10a9faa5606e02.tar.gz | |
ChangeLogTag: Mon Dec 23 15:16:21 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp | 7 |
2 files changed, 13 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index bd631e30e5f..d4d9c7709c6 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Mon Dec 23 15:16:21 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * tao/RTPortableServer/RT_Object_Adapter_Factory.cpp: Moved the + setting of the <collocation_resolver_name_> from the constructor + to create (), since it is not required immediately on loading + the RT_PortableServer. This should fix a problem with GCC 2.95 + builds on Solaris where the static initializations are all + messed up! Surprising that other tests even work. + Mon Dec 23 10:44:19 2002 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp: diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp index bb57456cd56..890d678339c 100644 --- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp +++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp @@ -14,9 +14,6 @@ ACE_RCSID (TAO_RTPortableServer, TAO_RT_Object_Adapter_Factory::TAO_RT_Object_Adapter_Factory (void) { - // Set the name of the collocation resolver to be RT_Collocation_Resolver. - TAO_ORB_Core::set_collocation_resolver ("RT_Collocation_Resolver"); - ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_Collocation_Resolver); } TAO_Adapter* @@ -26,6 +23,10 @@ TAO_RT_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core) CORBA::Object_var current = new TAO_POA_Current; orb_core->poa_current (current.in ()); + // Set the name of the collocation resolver to be RT_Collocation_Resolver. + TAO_ORB_Core::set_collocation_resolver ("RT_Collocation_Resolver"); + ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_Collocation_Resolver); + TAO_Object_Adapter *object_adapter = 0; ACE_NEW_RETURN (object_adapter, TAO_Object_Adapter (orb_core->server_factory ()-> |