diff options
| author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-03-13 17:32:43 +0000 |
|---|---|---|
| committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-03-13 17:32:43 +0000 |
| commit | 9551bf40b239c7a59d405bbac984f48f6f556ebe (patch) | |
| tree | 5d118cb51468a6c8f5746853b905208a193b492c | |
| parent | 7cddfd814db62d1bcc1a4f8be3c73e53995297de (diff) | |
| download | ATCD-9551bf40b239c7a59d405bbac984f48f6f556ebe.tar.gz | |
ChangeLogTag: Tue Mar 13 18:24:27 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
220 files changed, 1876 insertions, 260 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c8b44bd2034..7c77bcb459b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,245 @@ +Tue Mar 13 18:24:27 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + + * examples/PluggableUDP/tests/Basic/client.cpp: + * examples/PluggableUDP/tests/Basic/server.cpp: + * examples/Simple/grid/Grid_i.cpp: + * examples/Simple/time-date/Time_Date.cpp: + * performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp: + * performance-tests/Latency/Single_Threaded/server.cpp: + * performance-tests/Latency/Thread_Per_Connection/server.cpp: + * performance-tests/Latency/Thread_Pool/server.cpp: + * performance-tests/POA/Object_Creation_And_Registration/registration.cpp: + * performance-tests/Sequence_Latency/Single_Threaded/server.cpp: + * performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp: + * performance-tests/Sequence_Latency/Thread_Pool/server.cpp: + * performance-tests/Throughput/Throughput.mpc: + * performance-tests/Throughput/server.cpp: + * tests/AMH_Exceptions/server.cpp: + * tests/AMH_Oneway/server.cpp: + * tests/AMI/server.cpp: + * tests/AMI/simple_client.cpp: + * tests/AMI_Buffering/admin.cpp: + * tests/AMI_Buffering/client.cpp: + * tests/AMI_Buffering/server.cpp: + * tests/AMI_Timeouts/client.cpp: + * tests/AMI_Timeouts/server.cpp: + * tests/Abstract_Interface/server.cpp: + * tests/Abstract_Interface/test_i.h: + * tests/Abstract_Interface/test_i.cpp: + * tests/Any/Recursive/server.cpp: + * tests/BiDirectional/client.cpp: + * tests/BiDirectional_DelayedUpcall/client.cpp: + * tests/BiDirectional_NestedUpcall/client.cpp: + * tests/Big_AMI/client.cpp: + * tests/Big_AMI/server.cpp: + * tests/Big_Oneways/client.cpp: + * tests/Big_Oneways/server.cpp: + * tests/Big_Reply/server.cpp: + * tests/Big_Request_Muxing/server.cpp: + * tests/Big_Twoways/client.cpp: + * tests/Big_Twoways/server.cpp: + * tests/Blocking_Sync_None/server.cpp: + * tests/Bug_1020_Basic_Regression/client.cpp: + * tests/Bug_1020_Basic_Regression/server.cpp: + * tests/Bug_1020_Regression/client.cpp: + * tests/Bug_1020_Regression/server.cpp: + * tests/Bug_1254_Regression/server.cpp: + * tests/Bug_1269_Regression/client.cpp: + * tests/Bug_1269_Regression/server.cpp: + * tests/Bug_1270_Regression/client.cpp: + * tests/Bug_1270_Regression/server.cpp: + * tests/Bug_1330_Regression/server.cpp: + * tests/Bug_1361_Regression/client.cpp: + * tests/Bug_1361_Regression/server.cpp: + * tests/Bug_1383_Regression/SimpleClient.cpp: + * tests/Bug_1383_Regression/SimpleServer.cpp: + * tests/Bug_1476_Regression/server.cpp: + * tests/Bug_1482_Regression/server.cpp: + * tests/Bug_1495_Regression/Server_Task.cpp: + * tests/Bug_1551_Regression/server.cpp: + * tests/Bug_1568_Regression/server.cpp: + * tests/Bug_1627_Regression/server.cpp: + * tests/Bug_1670_Regression/server.cpp: + * tests/Bug_1676_Regression/server.cpp: + * tests/Bug_2084_Regression/Client_Task.cpp: + * tests/Bug_2084_Regression/Server_Task.cpp: + * tests/Bug_2134_Regression/Hello.cpp: + * tests/Bug_2174_Regression/server.cpp: + * tests/Bug_2183_Regression/server.cpp: + * tests/Bug_2186_Regression/client.cpp: + * tests/Bug_2186_Regression/server.cpp: + * tests/Bug_2188_Regression/server.cpp: + * tests/Bug_2289_Regression/client.cpp: + * tests/Bug_2289_Regression/server.cpp: + * tests/Bug_2319_Regression/server.cpp: + * tests/Bug_2328_Regression/server.cpp: + * tests/Bug_2349_Regression/server.cpp: + * tests/Bug_2417_Regression/client.cpp: + * tests/Bug_2417_Regression/server.cpp: + * tests/Bug_2429_Regression/client.cpp: + * tests/Bug_2429_Regression/server.cpp: + * tests/Bug_2494_Regression/server.cpp: + * tests/Bug_2503_Regression/test_i.cpp: + * tests/Bug_2560_Regression/server.cpp: + * tests/Bug_2593_Regression/server.cpp: + * tests/Bug_2595_Regression/server.cpp: + * tests/Bug_2669_Regression/client.cpp: + * tests/Bug_2683_Regression/server.cpp: + * tests/COIOP/COIOP_Simple_Test.cpp: + * tests/COIOP/Server_Task.cpp: + * tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp: + * tests/Cache_Growth_Test/server.cpp: + * tests/CallbackTest/client.cpp: + * tests/CallbackTest/server.cpp: + * tests/Client_Leaks/Process_Factory.cpp: + * tests/Client_Leaks/child.cpp: + * tests/Client_Leaks/server.cpp: + * tests/CodeSets/simple/server.cpp: + * tests/Collocation_Exception_Test/Server_Task.cpp: + * tests/Collocation_Oneway_Tests/Server_Task.cpp: + * tests/Collocation_Opportunities/Collocation_Opportunities.cpp: + * tests/Collocation_Tests/Server_Task.cpp: + * tests/Connect_Strategy_Test/server.cpp: + * tests/Connection_Purging/server.cpp: + * tests/Crash_On_Write/server.cpp: + * tests/Crashed_Callback/client.cpp: + * tests/Crashed_Callback/server.cpp: + * tests/DII_Collocation_Tests/oneway/Server_Task.cpp: + * tests/DII_Collocation_Tests/twoway/Server_Task.cpp: + * tests/DLL_ORB/Test_Server_Module.cpp: + * tests/DSI_AMI_Gateway/server.cpp: + * tests/DSI_Gateway/server.cpp: + * tests/Explicit_Event_Loop/server.cpp: + * tests/FL_Cube/server.cpp: + * tests/Faults/client.cpp: + * tests/Faults/middle.cpp: + * tests/Faults/ping.cpp: + * tests/Faults/pong.cpp: + * tests/Faults/server.cpp: + * tests/File_IO/File_i.cpp: + * tests/Forwarding/server.cpp: + * tests/GIOP_Fragments/Java_Big_Request/server.cpp: + * tests/Hang_Shutdown/server.cpp: + * tests/Hello/server.cpp: + * tests/ICMG_Any_Bug/Hello.cpp: + * tests/ICMG_Any_Bug/server.cpp: + * tests/IOR_Endpoint_Hostnames/generate_ior.cpp: + * tests/IPV6/server.cpp: + * tests/Leader_Followers/server.cpp: + * tests/LongDouble/server.cpp: + * tests/LongUpcalls/AMI_Manager.cpp: + * tests/LongUpcalls/ami_client.cpp: + * tests/LongUpcalls/ami_server.cpp: + * tests/LongUpcalls/blocking_client.cpp: + * tests/LongUpcalls/blocking_server.cpp: + * tests/MProfile/server.cpp: + * tests/MProfile_Connection_Timeout/server.cpp: + * tests/MProfile_Forwarding/server.cpp: + * tests/MT_BiDir/client.cpp: + * tests/MT_Client/server.cpp: + * tests/MT_Server/server.cpp: + * tests/MT_Timeout/server.cpp: + * tests/Multiple/server.cpp: + * tests/Muxed_GIOP_Versions/server.cpp: + * tests/Muxing/server.cpp: + * tests/Native_Exceptions/server.cpp: + * tests/NestedUpcall/MT_Client_Test/local_server.cpp: + * tests/NestedUpcall/Simple/client.cpp: + * tests/NestedUpcall/Simple/server.cpp: + * tests/NestedUpcall/Simple/simple-client.cpp: + * tests/NestedUpcall/Triangle_Test/initiator.cpp: + * tests/Nested_Event_Loop/server.cpp: + * tests/Nested_Upcall_Crash/Client_Peer.cpp: + * tests/Nested_Upcall_Crash/Server_Peer.cpp: + * tests/Nested_Upcall_Crash/client.cpp: + * tests/Nested_Upcall_Crash/server.cpp: + * tests/No_Server_MT_Connect_Test/server.cpp: + * tests/OBV/Any/server.cpp: + * tests/OBV/Collocated/Forward/Server_Task.cpp: + * tests/OBV/Factory/server.cpp: + * tests/OBV/Forward/server.cpp: + * tests/OBV/TC_Alignment/server.cpp: + * tests/OBV/Truncatable/server.cpp: + * tests/OBV/ValueBox/server.cpp: + * tests/ORB_shutdown/server.cpp: + * tests/Object_Loader/Loader.cpp: + * tests/Objref_Sequence_Test/server.cpp: + * tests/OctetSeq/server.cpp: + * tests/Ondemand_Write/server.cpp: + * tests/Oneway_Buffering/admin.cpp: + * tests/Oneway_Buffering/server.cpp: + * tests/Oneways_Invoking_Twoways/client.cpp: + * tests/Oneways_Invoking_Twoways/server.cpp: + * tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp: + * tests/POA/Object_Reactivation/Object_Reactivation.cpp: + * tests/POA/POA_Destruction/POA_Destruction.cpp: + * tests/POA/Persistent_ID/server.cpp: + * tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp: + * tests/POA/wait_for_completion/wait_for_completion.cpp: + * tests/Parallel_Connect_Strategy/server.cpp: + * tests/Portable_Interceptors/AMI/server.cpp: + * tests/Portable_Interceptors/AdvSlot/server.cpp: + * tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp: + * tests/Portable_Interceptors/AdvSlotExt/server.cpp: + * tests/Portable_Interceptors/ORB_Shutdown/server.cpp: + * tests/Portable_Interceptors/PICurrent/test_i.cpp: + * tests/Portable_Interceptors/Redirection/server.cpp: + * tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp: + * tests/QtTests/server.cpp: + * tests/RTCORBA/Dynamic_Thread_Pool/server.cpp: + * tests/RTCORBA/Linear_Priority/server.cpp: + * tests/RTCORBA/Policy_Combinations/server.cpp: + * tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp: + * tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp: + * tests/RTCORBA/Thread_Pool/server.cpp: + * tests/Reliable_Oneways/server.cpp: + * tests/Server_Connection_Purging/server.cpp: + * tests/Server_Leaks/server.cpp: + * tests/Server_Port_Zero/server.cpp: + * tests/Single_Read/server.cpp: + * tests/Smart_Proxies/Benchmark/server.cpp: + * tests/Smart_Proxies/On_Demand/server.cpp: + * tests/Smart_Proxies/Policy/server.cpp: + * tests/Smart_Proxies/server.cpp: + * tests/Stack_Recursion/server.cpp: + * tests/Strategies/server.cpp: + * tests/Timed_Buffered_Oneways/server.cpp: + * tests/Timeout/server.cpp: + * tests/Two_Objects/Object_Factory_i.cpp: + * tests/Two_Objects/server.cpp: + * tests/Typedef_String_Array/server.cpp: + * tests/UNKNOWN_Exception/server.cpp: + * tests/Xt_Stopwatch/server.cpp: + + Modified the majority of the TAO tests, performance-tests and + examples to use explicit activation to support CORBA e compact. + + * tests/CORBA_e_Implicit_Activation: + * tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc: + * tests/CORBA_e_Implicit_Activation/Hello.h: + * tests/CORBA_e_Implicit_Activation/Hello.cpp: + * tests/CORBA_e_Implicit_Activation/Test.idl: + * tests/CORBA_e_Implicit_Activation/run_test.pl: + * tests/CORBA_e_Implicit_Activation/server.cpp: + + Added a new test to ensure that CORBA e compact builds throw the + correct exception when implicit activation is used. + + * tests/Object_Loader/driver.cpp: + + Check the object reference after the _narrow() to avoid a core + dump. + + * tests/Object_Loader/run_test.pl: + + Use the PerlACE::add_lib_path() function to add the library + directory instead of directly modifying the PATH environment + variable. + + * tests/Nested_Event_Loop/test_i.cpp: + + Fixed an exception message to match the right method name. + Tue Mar 13 18:00:34 UTC 2007 Ossama Othman <ossama_othman at symantec dot com> * tao/Valuetype/Valuetype_Traits_T.h (copy_range): diff --git a/TAO/examples/PluggableUDP/tests/Basic/client.cpp b/TAO/examples/PluggableUDP/tests/Basic/client.cpp index db74e8d9563..4e4b487c01a 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/client.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/client.cpp @@ -120,8 +120,13 @@ main (int argc, char *argv[]) // let it remember our ORB udp_i.orb (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&udp_i); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + UDP_var udpHandler_var = - udp_i._this (); + UDP::_narrow (object_act.in ()); // Instantiate client UDP_Client_i *client = new UDP_Client_i (orb.in (), diff --git a/TAO/examples/PluggableUDP/tests/Basic/server.cpp b/TAO/examples/PluggableUDP/tests/Basic/server.cpp index b9797f81548..b3809af34e0 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/server.cpp @@ -150,8 +150,13 @@ main (int argc, char *argv[]) udpHandler_i.orb (orb.in ()); + PortableServer::ObjectId_var id_act = + persistent_poa->activate_object (&udpHandler_i); + + CORBA::Object_var object_act = persistent_poa->id_to_reference (id_act.in ()); + UDP_var udpHandler_var = - udpHandler_i._this (); + UDP::_narrow (object_act.in ()); // Instantiate client UDP_Client_i* client = new UDP_Client_i (orb, diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp index ac8bd324bd9..a15811675ba 100644 --- a/TAO/examples/Simple/grid/Grid_i.cpp +++ b/TAO/examples/Simple/grid/Grid_i.cpp @@ -177,6 +177,17 @@ Grid_Factory_i::make_grid (CORBA::Short width, CORBA::NO_MEMORY ()); // Register the Grid pointer. - Grid_ptr gptr = grid_ptr->_this (); + CORBA::Object_var poa_object = + this->orb_->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + PortableServer::ObjectId_var id = + root_poa->activate_object (grid_ptr); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Grid_ptr gptr = Grid::_narrow (object.in ()); return gptr; } diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp index e2a7aab8d18..4d2c545d02c 100644 --- a/TAO/examples/Simple/time-date/Time_Date.cpp +++ b/TAO/examples/Simple/time-date/Time_Date.cpp @@ -186,8 +186,19 @@ Time_Date_Servant::init (int argc, char *argv[]) Time_Date_i * servant = new Time_Date_i; PortableServer::ServantBase_var safe_servant = servant; + CORBA::Object_var poa_object = + orb->orb_->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + PortableServer::ObjectId_var id = + root_poa->activate_object (servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + CORBA::Object_var obj = - servant->_this (); + CORBA::Object::_narrow (object.in ()); CORBA::String_var str = orb->orb_->object_to_string (obj.in ()); diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp index 5cd76fa46b3..0a13e813d60 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp @@ -217,8 +217,13 @@ Cubit_Task::create_servants (void) // to stdout. Someone will take that string and give it to // some client. Then release the object. + PortableServer::ObjectId_var id_act = + poa->activate_object (this->servants_[i]); + + CORBA::Object_var object_act = poa->id_to_reference (id_act.in ()); + Cubit_var cubit = - this->servants_[i]->_this (); + Cubit::_narrow (object_act.in ()); CORBA::String_var str = diff --git a/TAO/performance-tests/Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Latency/Single_Threaded/server.cpp index 1e5b9bb067f..d779b7f755a 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Latency/Single_Threaded/server.cpp @@ -90,8 +90,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(roundtrip_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (roundtrip_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (); + Test::Roundtrip::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (roundtrip.in ()); diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp index 5545b3a0fa4..c159645d6ab 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp @@ -90,8 +90,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(roundtrip_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (roundtrip_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (); + Test::Roundtrip::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (roundtrip.in ()); diff --git a/TAO/performance-tests/Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Latency/Thread_Pool/server.cpp index e2fe122c00e..7219b6d4736 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Pool/server.cpp @@ -91,8 +91,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(roundtrip_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (roundtrip_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (); + Test::Roundtrip::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (roundtrip.in ()); diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp index f3945c14ae4..15875f51c2b 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp @@ -377,7 +377,10 @@ main (int argc, char **argv) for (i = 0; i < iterations; i++) { - objects[i] = servants[i]._this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servants[i]); + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + objects[i] = test::_narrow (object.in ()); } } diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp index 9d14fe6f957..f6b95c7bada 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp @@ -90,8 +90,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(roundtrip_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (roundtrip_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (); + Test::Roundtrip::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (roundtrip.in ()); diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp index 5545b3a0fa4..c159645d6ab 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp @@ -90,8 +90,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(roundtrip_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (roundtrip_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (); + Test::Roundtrip::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (roundtrip.in ()); diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp index 86ab5121e98..6e48e7f464f 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp @@ -91,8 +91,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(roundtrip_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (roundtrip_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (); + Test::Roundtrip::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (roundtrip.in ()); diff --git a/TAO/performance-tests/Throughput/Throughput.mpc b/TAO/performance-tests/Throughput/Throughput.mpc index e0baa06c094..febd63f91ed 100644 --- a/TAO/performance-tests/Throughput/Throughput.mpc +++ b/TAO/performance-tests/Throughput/Throughput.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { +project(*idl): taoidldefaults, avoids_corba_e_compact { IDL_Files { Test.idl } custom_only = 1 } -project(*server): taoserver, strategies { +project(*server): taoserver, strategies, avoids_corba_e_compact { after += *idl Source_Files { TestC.cpp @@ -21,7 +21,7 @@ project(*server): taoserver, strategies { } } -project(*client): taoclient, strategies { +project(*client): taoclient, strategies, avoids_corba_e_compact { after += *idl Source_Files { TestC.cpp diff --git a/TAO/performance-tests/Throughput/server.cpp b/TAO/performance-tests/Throughput/server.cpp index aa4c0cbab90..87ca6634d03 100644 --- a/TAO/performance-tests/Throughput/server.cpp +++ b/TAO/performance-tests/Throughput/server.cpp @@ -64,8 +64,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var receiver_factory_owner_transfer(receiver_factory_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (receiver_factory_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Receiver_Factory_var receiver_factory = - receiver_factory_impl->_this (); + Test::Receiver_Factory::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (receiver_factory.in ()); diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp index 01e3244e6c6..9e6a52cb0f3 100644 --- a/TAO/tests/AMH_Exceptions/server.cpp +++ b/TAO/tests/AMH_Exceptions/server.cpp @@ -160,8 +160,19 @@ ST_AMH_Server::register_servant (ST_AMH_Servant *servant) { try { + CORBA::Object_var poa_object = + this->orb_->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + PortableServer::ObjectId_var id = + root_poa->activate_object (servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Roundtrip_var roundtrip = - servant->_this (); + Test::Roundtrip::_narrow (object.in ()); CORBA::String_var ior = this->orb_->object_to_string (roundtrip.in ()); diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp index b6417931581..153f0064225 100644 --- a/TAO/tests/AMH_Oneway/server.cpp +++ b/TAO/tests/AMH_Oneway/server.cpp @@ -187,8 +187,19 @@ ST_AMH_Server::register_servant (ST_AMH_Servant *servant) { try { + CORBA::Object_var poa_object = + this->orb_->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + PortableServer::ObjectId_var id = + root_poa->activate_object (servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Roundtrip_var roundtrip = - servant->_this (); + Test::Roundtrip::_narrow (object.in ()); CORBA::String_var ior = this->orb_->object_to_string (roundtrip.in ()); diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp index 6d2b8c8acfe..10bf82e95b2 100644 --- a/TAO/tests/AMI/server.cpp +++ b/TAO/tests/AMI/server.cpp @@ -78,8 +78,13 @@ main (int argc, char *argv[]) AMI_Test_i ami_test_i (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&ami_test_i); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + A::AMI_Test_var ami_test_var = - ami_test_i._this (); + A::AMI_Test::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (ami_test_var.in ()); diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp index b244bc91722..e9611f8b9d6 100644 --- a/TAO/tests/AMI/simple_client.cpp +++ b/TAO/tests/AMI/simple_client.cpp @@ -187,8 +187,13 @@ main (int argc, char *argv[]) // Instantiate the ReplyHandler and register that with the POA. Handler handler; + PortableServer::ObjectId_var id = + poa_var->activate_object (&handler); + + CORBA::Object_var object = poa_var->id_to_reference (id.in ()); + A::AMI_AMI_TestHandler_var the_handler_var = - handler._this (); + A::AMI_AMI_TestHandler::_narrow (object.in ()); // Try out sending asynchronous messages without a reply handler // registered. Things fail if we get an exception. diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp index 66b937dc185..6e34ed3e5a0 100644 --- a/TAO/tests/AMI_Buffering/admin.cpp +++ b/TAO/tests/AMI_Buffering/admin.cpp @@ -65,8 +65,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(AMI_buffering_admin_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (AMI_buffering_admin_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::AMI_Buffering_Admin_var AMI_buffering_admin = - AMI_buffering_admin_impl->_this (); + Test::AMI_Buffering_Admin::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (AMI_buffering_admin.in ()); diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp index 10cd9d44edf..3b570850204 100644 --- a/TAO/tests/AMI_Buffering/client.cpp +++ b/TAO/tests/AMI_Buffering/client.cpp @@ -92,20 +92,24 @@ parse_args (int argc, char *argv[]) int run_message_count (CORBA::ORB_ptr orb, + PortableServer::POA_ptr root_poa, Test::AMI_Buffering_ptr ami_buffering, Test::AMI_Buffering_Admin_ptr ami_buffering_admin); int run_timeout (CORBA::ORB_ptr orb, + PortableServer::POA_ptr root_poa, Test::AMI_Buffering_ptr ami_buffering, Test::AMI_Buffering_Admin_ptr ami_buffering_admin); int run_timeout_reactive (CORBA::ORB_ptr orb, + PortableServer::POA_ptr root_poa, Test::AMI_Buffering_ptr oneway_buffering, Test::AMI_Buffering_Admin_ptr oneway_buffering_admin); int run_buffer_size (CORBA::ORB_ptr orb, + PortableServer::POA_ptr root_poa, Test::AMI_Buffering_ptr ami_buffering, Test::AMI_Buffering_Admin_ptr ami_buffering_admin); @@ -177,6 +181,7 @@ main (int argc, char *argv[]) "Running message count flushing test\n")); test_failed = run_message_count (orb.in (), + root_poa.in (), ami_buffering.in (), ami_buffering_admin.in ()); } @@ -186,6 +191,7 @@ main (int argc, char *argv[]) "Running timeout flushing test\n")); test_failed = run_timeout (orb.in (), + root_poa.in (), ami_buffering.in (), ami_buffering_admin.in ()); } @@ -195,6 +201,7 @@ main (int argc, char *argv[]) "Running timeout (reactive) flushing test\n")); test_failed = run_timeout_reactive (orb.in (), + root_poa.in (), ami_buffering.in (), ami_buffering_admin.in ()); } @@ -204,6 +211,7 @@ main (int argc, char *argv[]) "Running buffer size flushing test\n")); test_failed = run_buffer_size (orb.in (), + root_poa.in (), ami_buffering.in (), ami_buffering_admin.in ()); } @@ -374,6 +382,7 @@ run_liveness_test (CORBA::ORB_ptr orb, int run_message_count (CORBA::ORB_ptr orb, + PortableServer::POA_ptr root_poa, Test::AMI_Buffering_ptr ami_buffering, Test::AMI_Buffering_Admin_ptr ami_buffering_admin) { @@ -402,8 +411,13 @@ run_message_count (CORBA::ORB_ptr orb, 1); PortableServer::ServantBase_var owner_transfer(reply_handler_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (reply_handler_impl); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::AMI_AMI_BufferingHandler_var reply_handler = - reply_handler_impl->_this (); + Test::AMI_AMI_BufferingHandler::_narrow (object_act.in ()); CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) @@ -479,8 +493,9 @@ run_message_count (CORBA::ORB_ptr orb, int run_timeout (CORBA::ORB_ptr orb, - Test::AMI_Buffering_ptr ami_buffering, - Test::AMI_Buffering_Admin_ptr ami_buffering_admin) + PortableServer::POA_ptr root_poa, + Test::AMI_Buffering_ptr ami_buffering, + Test::AMI_Buffering_Admin_ptr ami_buffering_admin) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_TIMEOUT; @@ -507,8 +522,13 @@ run_timeout (CORBA::ORB_ptr orb, 1); PortableServer::ServantBase_var owner_transfer(reply_handler_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (reply_handler_impl); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::AMI_AMI_BufferingHandler_var reply_handler = - reply_handler_impl->_this (); + Test::AMI_AMI_BufferingHandler::_narrow (object_act.in ()); CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) @@ -585,6 +605,7 @@ run_timeout (CORBA::ORB_ptr orb, int run_timeout_reactive (CORBA::ORB_ptr orb, + PortableServer::POA_ptr root_poa, Test::AMI_Buffering_ptr ami_buffering, Test::AMI_Buffering_Admin_ptr ami_buffering_admin) { @@ -613,8 +634,13 @@ run_timeout_reactive (CORBA::ORB_ptr orb, 1); PortableServer::ServantBase_var owner_transfer(reply_handler_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (reply_handler_impl); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::AMI_AMI_BufferingHandler_var reply_handler = - reply_handler_impl->_this (); + Test::AMI_AMI_BufferingHandler::_narrow (object_act.in ()); CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) @@ -695,6 +721,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, int run_buffer_size (CORBA::ORB_ptr orb, + PortableServer::POA_ptr root_poa, Test::AMI_Buffering_ptr ami_buffering, Test::AMI_Buffering_Admin_ptr ami_buffering_admin) { @@ -721,8 +748,13 @@ run_buffer_size (CORBA::ORB_ptr orb, 1); PortableServer::ServantBase_var owner_transfer(reply_handler_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (reply_handler_impl); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::AMI_AMI_BufferingHandler_var reply_handler = - reply_handler_impl->_this (); + Test::AMI_AMI_BufferingHandler::_narrow (object_act.in ()); CORBA::ULong bytes_sent = 0; for (int i = 0; i != iterations; ++i) diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp index aa0de89d4ac..000cf980d2b 100644 --- a/TAO/tests/AMI_Buffering/server.cpp +++ b/TAO/tests/AMI_Buffering/server.cpp @@ -86,8 +86,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(AMI_buffering_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (AMI_buffering_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::AMI_Buffering_var AMI_buffering = - AMI_buffering_impl->_this (); + Test::AMI_Buffering::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (AMI_buffering.in ()); diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp index 4e107ab1e61..e6926258dce 100644 --- a/TAO/tests/AMI_Timeouts/client.cpp +++ b/TAO/tests/AMI_Timeouts/client.cpp @@ -105,8 +105,13 @@ main (int argc, char *argv[]) // Instantiate reply handler TimeoutHandler_i timeoutHandler_i; + PortableServer::ObjectId_var id = + root_poa->activate_object (&timeoutHandler_i); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + AMI_TimeoutObjHandler_var timeoutHandler_var = - timeoutHandler_i._this (); + AMI_TimeoutObjHandler::_narrow (object_act.in ()); // Instantiate client TimeoutClient client (orb.in (), diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp index 61f942fed95..db6bc8e17b9 100644 --- a/TAO/tests/AMI_Timeouts/server.cpp +++ b/TAO/tests/AMI_Timeouts/server.cpp @@ -78,8 +78,13 @@ main (int argc, char *argv[]) Timeout_i timeout_i (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&timeout_i); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + TimeoutObj_var timeout_var = - timeout_i._this (); + TimeoutObj::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (timeout_var.in ()); @@ -104,8 +109,13 @@ main (int argc, char *argv[]) // Instantiate reply handler TimeoutHandler_i timeoutHandler_i; + PortableServer::ObjectId_var idu = + root_poa->activate_object (&timeoutHandler_i); + + CORBA::Object_var objectu = root_poa->id_to_reference (idu.in ()); + AMI_TimeoutObjHandler_var timeoutHandler_var = - timeoutHandler_i._this (); + AMI_TimeoutObjHandler::_narrow (objectu.in ()); // Instantiate client /* diff --git a/TAO/tests/Abstract_Interface/server.cpp b/TAO/tests/Abstract_Interface/server.cpp index d9dca0ceb04..5f52dcbe27b 100644 --- a/TAO/tests/Abstract_Interface/server.cpp +++ b/TAO/tests/Abstract_Interface/server.cpp @@ -96,9 +96,14 @@ main (int argc, char *argv[]) return 1; } - passer_i servant; + passer_i servant (root_poa.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + passer_var server = - servant._this (); + passer::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Abstract_Interface/test_i.cpp b/TAO/tests/Abstract_Interface/test_i.cpp index b81ae04a431..285f5ef5f68 100644 --- a/TAO/tests/Abstract_Interface/test_i.cpp +++ b/TAO/tests/Abstract_Interface/test_i.cpp @@ -43,14 +43,25 @@ foo_i::base_op (const char * inarg) return retval._retn (); } +passer_i::passer_i (PortableServer::POA_ptr poa) + : poa_ (PortableServer::POA::_duplicate (poa)) +{ +} + void passer_i::pass_ops (base_out outarg) { foo_i *servant = 0; ACE_NEW (servant, foo_i); + + PortableServer::ObjectId_var id = + this->poa_->activate_object (servant); + + CORBA::Object_var object = this->poa_->id_to_reference (id.in ()); + PortableServer::ServantBase_var safety (servant); - outarg = servant->_this (); + outarg = foo::_narrow (object.in ()); } void diff --git a/TAO/tests/Abstract_Interface/test_i.h b/TAO/tests/Abstract_Interface/test_i.h index 361fb433ab8..28fcc41464c 100644 --- a/TAO/tests/Abstract_Interface/test_i.h +++ b/TAO/tests/Abstract_Interface/test_i.h @@ -14,9 +14,15 @@ class foo_i : public virtual POA_foo class passer_i : public virtual POA_passer { +public: + passer_i (PortableServer::POA_ptr poa); + virtual void pass_ops (base_out outarg); virtual void pass_state (base_out outarg); + +private: + PortableServer::POA_var poa_; }; #endif /* TAO_TEST_I_H */ diff --git a/TAO/tests/Any/Recursive/server.cpp b/TAO/tests/Any/Recursive/server.cpp index c6d906f0c61..edfe2b98049 100644 --- a/TAO/tests/Any/Recursive/server.cpp +++ b/TAO/tests/Any/Recursive/server.cpp @@ -67,8 +67,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp index 4638e3f968f..4fe18d7c1b9 100644 --- a/TAO/tests/BiDirectional/client.cpp +++ b/TAO/tests/BiDirectional/client.cpp @@ -109,8 +109,13 @@ main (int argc, char *argv[]) Callback_i callback_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&callback_impl); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Callback_var callback = - callback_impl._this (); + Callback::_narrow (object_act.in ()); // Send the calback object to the server server->callback_object (callback.in ()); diff --git a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp index 36d95b46c6c..7b35adecdd1 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp @@ -114,8 +114,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(callback_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (callback_impl); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Callback_var callback = - callback_impl->_this (); + Callback::_narrow (object_act.in ()); // Send the calback object to the server server->callback_object (callback.in ()); diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp index 70d5e50338b..e07eaeec63f 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp @@ -114,8 +114,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(callback_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (callback_impl); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Callback_var callback = - callback_impl->_this (); + Callback::_narrow (object_act.in ()); // Send the calback object to the server server->callback_object (callback.in ()); diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp index 7e99acf658d..55b703839e0 100644 --- a/TAO/tests/Big_AMI/client.cpp +++ b/TAO/tests/Big_AMI/client.cpp @@ -158,8 +158,13 @@ main (int argc, char *argv[]) // Instantiate the ReplyHandler and register that with the POA. Handler handler; + PortableServer::ObjectId_var id = + poa_var->activate_object (&handler); + + CORBA::Object_var object = poa_var->id_to_reference (id.in ()); + A::AMI_AMI_TestHandler_var the_handler_var = - handler._this (); + A::AMI_AMI_TestHandler::_narrow (object.in ()); CORBA::Long l = 931247; A::Payload payload (payload_size); diff --git a/TAO/tests/Big_AMI/server.cpp b/TAO/tests/Big_AMI/server.cpp index 6d2b8c8acfe..10bf82e95b2 100644 --- a/TAO/tests/Big_AMI/server.cpp +++ b/TAO/tests/Big_AMI/server.cpp @@ -78,8 +78,13 @@ main (int argc, char *argv[]) AMI_Test_i ami_test_i (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&ami_test_i); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + A::AMI_Test_var ami_test_var = - ami_test_i._this (); + A::AMI_Test::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (ami_test_var.in ()); diff --git a/TAO/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp index dca6cfb2a33..a03963bfa21 100644 --- a/TAO/tests/Big_Oneways/client.cpp +++ b/TAO/tests/Big_Oneways/client.cpp @@ -79,8 +79,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var peer_owner_transfer(peer_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (peer_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Peer_var peer = - peer_impl->_this (); + Test::Peer::_narrow (object.in ()); poa_manager->activate (); diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp index 5e9e6300cc0..3cdf32eb9f3 100644 --- a/TAO/tests/Big_Oneways/server.cpp +++ b/TAO/tests/Big_Oneways/server.cpp @@ -89,8 +89,13 @@ main (int argc, char *argv[]) Coordinator (peer_count), 1); + PortableServer::ObjectId_var id = + root_poa->activate_object (coordinator_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Coordinator_var coordinator = - coordinator_impl->_this (); + Test::Coordinator::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (coordinator.in ()); @@ -131,8 +136,13 @@ main (int argc, char *argv[]) Session_Control (peer_count), 1); + PortableServer::ObjectId_var idu = + root_poa->activate_object (session_control_impl); + + CORBA::Object_var objectu = root_poa->id_to_reference (idu.in ()); + Test::Session_Control_var session_control = - session_control_impl->_this (); + Test::Session_Control::_narrow (objectu.in ()); Test::Session_List session_list; coordinator_impl->create_session_list (session_control.in (), diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp index 97f9056116d..af18a8004ba 100644 --- a/TAO/tests/Big_Reply/server.cpp +++ b/TAO/tests/Big_Reply/server.cpp @@ -76,8 +76,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var big_reply_owner_transfer(big_reply_gen); + PortableServer::ObjectId_var id = + root_poa->activate_object (big_reply_gen); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Big_Reply_var big_reply = - big_reply_gen->_this (); + Test::Big_Reply::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (big_reply.in ()); diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp index 95c0adb8498..e00dc7ef073 100644 --- a/TAO/tests/Big_Request_Muxing/server.cpp +++ b/TAO/tests/Big_Request_Muxing/server.cpp @@ -75,8 +75,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var receiver_owner_transfer(payload_receiver_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (payload_receiver_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Payload_Receiver_var payload_receiver = - payload_receiver_impl->_this (); + Test::Payload_Receiver::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (payload_receiver.in ()); diff --git a/TAO/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp index dca6cfb2a33..a03963bfa21 100644 --- a/TAO/tests/Big_Twoways/client.cpp +++ b/TAO/tests/Big_Twoways/client.cpp @@ -79,8 +79,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var peer_owner_transfer(peer_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (peer_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Peer_var peer = - peer_impl->_this (); + Test::Peer::_narrow (object.in ()); poa_manager->activate (); diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp index 98c54468bf9..0f3b099efaa 100644 --- a/TAO/tests/Big_Twoways/server.cpp +++ b/TAO/tests/Big_Twoways/server.cpp @@ -89,8 +89,13 @@ main (int argc, char *argv[]) Coordinator (peer_count), 1); + PortableServer::ObjectId_var id = + root_poa->activate_object (coordinator_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Coordinator_var coordinator = - coordinator_impl->_this (); + Test::Coordinator::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (coordinator.in ()); @@ -131,8 +136,12 @@ main (int argc, char *argv[]) Session_Control (peer_count), 1); + id = root_poa->activate_object (session_control_impl); + + object = root_poa->id_to_reference (id.in ()); + Test::Session_Control_var session_control = - session_control_impl->_this (); + Test::Session_Control::_narrow (object.in ()); Test::Session_List session_list; coordinator_impl->create_session_list (session_control.in (), diff --git a/TAO/tests/Blocking_Sync_None/server.cpp b/TAO/tests/Blocking_Sync_None/server.cpp index a8e8f0095f1..adca8860d1a 100644 --- a/TAO/tests/Blocking_Sync_None/server.cpp +++ b/TAO/tests/Blocking_Sync_None/server.cpp @@ -65,8 +65,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(blocking_sync_none_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (blocking_sync_none_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Blocking_Sync_None_var blocking_sync_none = - blocking_sync_none_impl->_this (); + Test::Blocking_Sync_None::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (blocking_sync_none.in ()); diff --git a/TAO/tests/Bug_1020_Basic_Regression/client.cpp b/TAO/tests/Bug_1020_Basic_Regression/client.cpp index 3f14ee64173..430babe0519 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/client.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/client.cpp @@ -104,8 +104,13 @@ main (int argc, char *argv[]) impl = tmp; } + PortableServer::ObjectId_var id = + root_poa->activate_object (impl.in ()); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::Echo_var echo = - impl->_this (); + Test::Echo::_narrow (object_act.in ()); CORBA::Object_var tmp = orb->string_to_object(ior); diff --git a/TAO/tests/Bug_1020_Basic_Regression/server.cpp b/TAO/tests/Bug_1020_Basic_Regression/server.cpp index 790e6c02d79..211cbf1b3f7 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/server.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/server.cpp @@ -76,8 +76,13 @@ main (int argc, char *argv[]) impl = tmp; } + PortableServer::ObjectId_var id = + root_poa->activate_object (impl.in ()); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Echo_Caller_var server = - impl->_this (); + Test::Echo_Caller::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Bug_1020_Regression/client.cpp b/TAO/tests/Bug_1020_Regression/client.cpp index e4959588a63..8da503b7384 100644 --- a/TAO/tests/Bug_1020_Regression/client.cpp +++ b/TAO/tests/Bug_1020_Regression/client.cpp @@ -86,8 +86,13 @@ main (int argc, char *argv[]) impl = tmp; } + PortableServer::ObjectId_var id = + root_poa->activate_object (impl.in ()); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::Echo_var echo = - impl->_this (); + Test::Echo::_narrow (object_act.in ()); CORBA::Object_var tmp = orb->string_to_object(ior); diff --git a/TAO/tests/Bug_1020_Regression/server.cpp b/TAO/tests/Bug_1020_Regression/server.cpp index 836d0f4cfc2..65de2d1780e 100644 --- a/TAO/tests/Bug_1020_Regression/server.cpp +++ b/TAO/tests/Bug_1020_Regression/server.cpp @@ -66,8 +66,13 @@ main (int argc, char *argv[]) impl = tmp; } + PortableServer::ObjectId_var id = + root_poa->activate_object (impl.in ()); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::Server_var server = - impl->_this (); + Test::Server::_narrow (object_act.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Bug_1254_Regression/server.cpp b/TAO/tests/Bug_1254_Regression/server.cpp index 85f74fe5d6e..88f0d31df3a 100644 --- a/TAO/tests/Bug_1254_Regression/server.cpp +++ b/TAO/tests/Bug_1254_Regression/server.cpp @@ -64,8 +64,13 @@ int main(int argc, char** argv) 1); PortableServer::ServantBase_var owner_transfer(blob_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (blob_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + BlobServer_var blob = - blob_impl->_this (); + BlobServer::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (blob.in ()); diff --git a/TAO/tests/Bug_1269_Regression/client.cpp b/TAO/tests/Bug_1269_Regression/client.cpp index 69f696cd0c0..7e8f800cbaa 100644 --- a/TAO/tests/Bug_1269_Regression/client.cpp +++ b/TAO/tests/Bug_1269_Regression/client.cpp @@ -76,8 +76,13 @@ main (int argc, char *argv[]) impl = tmp; } + PortableServer::ObjectId_var id = + root_poa->activate_object (impl.in ()); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::Echo_var echo = - impl->_this (); + Test::Echo::_narrow (object_act.in ()); CORBA::Object_var tmp = orb->string_to_object(ior); diff --git a/TAO/tests/Bug_1269_Regression/server.cpp b/TAO/tests/Bug_1269_Regression/server.cpp index 9785eb3aa5e..24b8d253dca 100644 --- a/TAO/tests/Bug_1269_Regression/server.cpp +++ b/TAO/tests/Bug_1269_Regression/server.cpp @@ -54,8 +54,13 @@ main (int argc, char *argv[]) impl = tmp; } + PortableServer::ObjectId_var id = + root_poa->activate_object (impl.in ()); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::Echo_Caller_var server = - impl->_this (); + Test::Echo_Caller::_narrow (object_act.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp index 5e16324f5ef..a33276e7667 100644 --- a/TAO/tests/Bug_1270_Regression/client.cpp +++ b/TAO/tests/Bug_1270_Regression/client.cpp @@ -77,8 +77,13 @@ main (int argc, char *argv[]) impl = tmp; } + PortableServer::ObjectId_var id = + root_poa->activate_object (impl.in ()); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::Echo_var echo = - impl->_this (); + Test::Echo::_narrow (object_act.in ()); CORBA::Object_var tmp = orb->string_to_object(ior); diff --git a/TAO/tests/Bug_1270_Regression/server.cpp b/TAO/tests/Bug_1270_Regression/server.cpp index f932c277454..f6ef264dbd8 100644 --- a/TAO/tests/Bug_1270_Regression/server.cpp +++ b/TAO/tests/Bug_1270_Regression/server.cpp @@ -54,8 +54,13 @@ main (int argc, char *argv[]) impl = tmp; } + PortableServer::ObjectId_var id = + root_poa->activate_object (impl.in ()); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::Echo_Caller_var server = - impl->_this (); + Test::Echo_Caller::_narrow (object_act.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Bug_1330_Regression/server.cpp b/TAO/tests/Bug_1330_Regression/server.cpp index 99b5f650cfd..48c1971a923 100644 --- a/TAO/tests/Bug_1330_Regression/server.cpp +++ b/TAO/tests/Bug_1330_Regression/server.cpp @@ -62,11 +62,12 @@ main (int argc, char *argv[]) Test_i server_impl; + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); - root_poa->activate_object ( &server_impl); - - CORBA::Object_var server = server_impl._this (); + CORBA::Object_var server = CORBA::Object::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp index c778859eb86..86774aa5880 100644 --- a/TAO/tests/Bug_1361_Regression/client.cpp +++ b/TAO/tests/Bug_1361_Regression/client.cpp @@ -109,8 +109,13 @@ main (int argc, char *argv[]) impl = tmp; } + PortableServer::ObjectId_var id = + root_poa->activate_object (impl.in ()); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::Echo_var echo = - impl->_this (); + Test::Echo::_narrow (object_act.in ()); CORBA::Object_var tmp = orb->string_to_object(ior); diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp index e6471c37179..4de46baba8e 100644 --- a/TAO/tests/Bug_1361_Regression/server.cpp +++ b/TAO/tests/Bug_1361_Regression/server.cpp @@ -59,8 +59,13 @@ main (int argc, char *argv[]) impl = tmp; } + PortableServer::ObjectId_var id = + root_poa->activate_object (impl.in ()); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::Echo_Caller_var server = - impl->_this (); + Test::Echo_Caller::_narrow (object_act.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Bug_1383_Regression/SimpleClient.cpp b/TAO/tests/Bug_1383_Regression/SimpleClient.cpp index 7d3089b7a7f..8208c7a5ae9 100644 --- a/TAO/tests/Bug_1383_Regression/SimpleClient.cpp +++ b/TAO/tests/Bug_1383_Regression/SimpleClient.cpp @@ -72,10 +72,16 @@ int main(int argc, char * argv[]) CORBA::String_var name1_ior = orb->object_to_string(name1.in()); CORBA::String_var name2_ior = orb->object_to_string(name2.in()); - // create a callback object - Callee_i * callee_i = new Callee_i; - // get the CORBA reference - Callee_var callee = callee_i->_this(); + // create a callback object + Callee_i * callee_i = new Callee_i; + // get the CORBA reference + PortableServer::ObjectId_var id = + poa->activate_object (callee_i); + + CORBA::Object_var object_act = poa->id_to_reference (id.in ()); + + Callee_var callee = Callee::_narrow (object_act.in ()); + if (CORBA::is_nil(callee.in ())) { ACE_ERROR ((LM_ERROR, "could not get callback object\n")); return 1; diff --git a/TAO/tests/Bug_1383_Regression/SimpleServer.cpp b/TAO/tests/Bug_1383_Regression/SimpleServer.cpp index c9de7d114bb..db025f79365 100644 --- a/TAO/tests/Bug_1383_Regression/SimpleServer.cpp +++ b/TAO/tests/Bug_1383_Regression/SimpleServer.cpp @@ -44,7 +44,12 @@ int main(int argc, char * argv[]) // it. It uses the "RootPOA" for dispatching its calls. There are // a number of ways this can be done different. Refer to "Advanced // CORBA Programming with C++" chapter 11 for more information. - Simple_var simpleRef = simple->_this(); + PortableServer::ObjectId_var id = + poa->activate_object (simple); + + CORBA::Object_var object_act = poa->id_to_reference (id.in ()); + + Simple_var simpleRef = Simple::_narrow (object_act.in ()); advertise(orb.in(), simpleRef.in()); diff --git a/TAO/tests/Bug_1476_Regression/server.cpp b/TAO/tests/Bug_1476_Regression/server.cpp index 56d9e398030..4e19b224566 100644 --- a/TAO/tests/Bug_1476_Regression/server.cpp +++ b/TAO/tests/Bug_1476_Regression/server.cpp @@ -69,8 +69,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var receiver_owner_transfer(sender_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (sender_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Sender_var sender = - sender_impl->_this (); + Test::Sender::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (sender.in ()); diff --git a/TAO/tests/Bug_1482_Regression/server.cpp b/TAO/tests/Bug_1482_Regression/server.cpp index 437f885e8c0..552fb90e01a 100644 --- a/TAO/tests/Bug_1482_Regression/server.cpp +++ b/TAO/tests/Bug_1482_Regression/server.cpp @@ -67,8 +67,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/Bug_1495_Regression/Server_Task.cpp b/TAO/tests/Bug_1495_Regression/Server_Task.cpp index c31aeb51c00..1e7e7bf0e44 100644 --- a/TAO/tests/Bug_1495_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1495_Regression/Server_Task.cpp @@ -56,8 +56,13 @@ Server_Task::svc (void) 0); PortableServer::ServantBase_var owner_transfer (server_impl); - Bug1495_Regression:: - Bug1495_var bug1495 = server_impl->_this(); + PortableServer::ObjectId_var id = + root_poa->activate_object (server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Bug1495_Regression::Bug1495_var bug1495 = + Bug1495_Regression::Bug1495::_narrow (object.in ()); CORBA::String_var ior = sorb_->object_to_string (bug1495.in ()); diff --git a/TAO/tests/Bug_1551_Regression/server.cpp b/TAO/tests/Bug_1551_Regression/server.cpp index efc4485a8d6..fd71f6b2ee7 100644 --- a/TAO/tests/Bug_1551_Regression/server.cpp +++ b/TAO/tests/Bug_1551_Regression/server.cpp @@ -77,8 +77,13 @@ main (int argc, char *argv[]) TAO::Utils::Servant_Var<Hello> hello_impl( new Hello(orb.in(), simulate_crashes)); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl.in ()); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp index e0c699b225b..6585a86fec2 100644 --- a/TAO/tests/Bug_1568_Regression/server.cpp +++ b/TAO/tests/Bug_1568_Regression/server.cpp @@ -135,8 +135,13 @@ main (int argc, char *argv[]) TAO::Utils::Servant_Var<Simple_C> simple_c_impl( new Simple_C(orb.in())); + PortableServer::ObjectId_var id = + root_poa->activate_object (simple_c_impl.in ()); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Baz::C_var simple_c = - simple_c_impl->_this (); + Baz::C::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (simple_c.in ()); diff --git a/TAO/tests/Bug_1627_Regression/server.cpp b/TAO/tests/Bug_1627_Regression/server.cpp index 99b5f650cfd..e8166ed5279 100644 --- a/TAO/tests/Bug_1627_Regression/server.cpp +++ b/TAO/tests/Bug_1627_Regression/server.cpp @@ -62,11 +62,10 @@ main (int argc, char *argv[]) Test_i server_impl; + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); - - root_poa->activate_object ( &server_impl); - - CORBA::Object_var server = server_impl._this (); + CORBA::Object_var server = root_poa->id_to_reference (id.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Bug_1670_Regression/server.cpp b/TAO/tests/Bug_1670_Regression/server.cpp index 886f4da7e2b..d7484aaa227 100644 --- a/TAO/tests/Bug_1670_Regression/server.cpp +++ b/TAO/tests/Bug_1670_Regression/server.cpp @@ -135,8 +135,13 @@ main (int argc, char *argv[]) TAO::Utils::Servant_Var<Simple_C> simple_c_impl( new Simple_C(orb.in())); + PortableServer::ObjectId_var id = + root_poa->activate_object (simple_c_impl.in ()); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Baz::C_var simple_c = - simple_c_impl->_this (); + Baz::C::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (simple_c.in ()); diff --git a/TAO/tests/Bug_1676_Regression/server.cpp b/TAO/tests/Bug_1676_Regression/server.cpp index c6d906f0c61..edfe2b98049 100644 --- a/TAO/tests/Bug_1676_Regression/server.cpp +++ b/TAO/tests/Bug_1676_Regression/server.cpp @@ -67,8 +67,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.cpp b/TAO/tests/Bug_2084_Regression/Client_Task.cpp index 327da7c9a13..0219846bc87 100644 --- a/TAO/tests/Bug_2084_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_2084_Regression/Client_Task.cpp @@ -49,7 +49,12 @@ Client_Task::svc (void) PortableServer::ServantBase_var owner_transfer(hello_impl); - Test::Hello_var hello_servant = hello_impl->_this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Test::Hello_var hello_servant = Test::Hello::_narrow (object.in ()); poa_manager->activate (); ACE_DEBUG((LM_DEBUG,"Client (%t) optimize_collocation_objects=%d use_global_collocation=%d\n", diff --git a/TAO/tests/Bug_2084_Regression/Server_Task.cpp b/TAO/tests/Bug_2084_Regression/Server_Task.cpp index 7c7706dedfe..b0d07718ed2 100644 --- a/TAO/tests/Bug_2084_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_2084_Regression/Server_Task.cpp @@ -45,7 +45,12 @@ Server_Task::svc (void) EventNode *evnode_impl = new EventNode(this->sorb_.in(),ACE_Thread::self()); PortableServer::ServantBase_var owner_transfer(evnode_impl); - Test::EventNode_var evNode = evnode_impl->_this(); + PortableServer::ObjectId_var id = + root_poa->activate_object (evnode_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Test::EventNode_var evNode = Test::EventNode::_narrow (object.in ()); ACE_DEBUG((LM_DEBUG,"Server (%t) optimize_collocation_objects=%d use_global_collocation=%d\n", sorb_->orb_core()->optimize_collocation_objects(), diff --git a/TAO/tests/Bug_2134_Regression/Hello.cpp b/TAO/tests/Bug_2134_Regression/Hello.cpp index 07ca7970547..1c4929b1e18 100644 --- a/TAO/tests/Bug_2134_Regression/Hello.cpp +++ b/TAO/tests/Bug_2134_Regression/Hello.cpp @@ -33,7 +33,17 @@ int main(int argc, char* argv[]) // create Hello object Test::Hello_impl hello_i; - Test::Hello_var hello = hello_i._this (); + // Get the root POA + CORBA::Object_var obj_root = orb->resolve_initial_references ("RootPOA"); + + PortableServer::POA_var rootPOA = PortableServer::POA::_narrow (obj_root.in ()); + + PortableServer::ObjectId_var id = + rootPOA->activate_object (&hello_i); + + CORBA::Object_var object = rootPOA->id_to_reference (id.in ()); + + Test::Hello_var hello = Test::Hello::_narrow (object.in ()); // give our object a friendly name CORBA::Object_var iorTableObj = @@ -48,11 +58,6 @@ int main(int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "Created binding of name 'hello' in IOR table for IOR:\n%s\n", ior_string.in ())); - // Get the root POA - CORBA::Object_var obj_root = orb->resolve_initial_references ("RootPOA"); - - PortableServer::POA_var rootPOA = PortableServer::POA::_narrow (obj_root.in ()); - // Activate the POA manager PortableServer::POAManager_var poaManager = rootPOA->the_POAManager (); diff --git a/TAO/tests/Bug_2174_Regression/server.cpp b/TAO/tests/Bug_2174_Regression/server.cpp index ac10f1791ec..ec48f1e0ace 100644 --- a/TAO/tests/Bug_2174_Regression/server.cpp +++ b/TAO/tests/Bug_2174_Regression/server.cpp @@ -67,8 +67,13 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Simple_Server_var server = - server_impl._this (); + Simple_Server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Bug_2183_Regression/server.cpp b/TAO/tests/Bug_2183_Regression/server.cpp index 5daff386502..bbcde579a8a 100644 --- a/TAO/tests/Bug_2183_Regression/server.cpp +++ b/TAO/tests/Bug_2183_Regression/server.cpp @@ -68,8 +68,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/Bug_2186_Regression/client.cpp b/TAO/tests/Bug_2186_Regression/client.cpp index 2f052b73f13..3d163843a6d 100644 --- a/TAO/tests/Bug_2186_Regression/client.cpp +++ b/TAO/tests/Bug_2186_Regression/client.cpp @@ -68,8 +68,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/Bug_2186_Regression/server.cpp b/TAO/tests/Bug_2186_Regression/server.cpp index 530fbbff5fe..9631352c99f 100644 --- a/TAO/tests/Bug_2186_Regression/server.cpp +++ b/TAO/tests/Bug_2186_Regression/server.cpp @@ -67,8 +67,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/Bug_2188_Regression/server.cpp b/TAO/tests/Bug_2188_Regression/server.cpp index bd148395e18..4eba57f9c90 100644 --- a/TAO/tests/Bug_2188_Regression/server.cpp +++ b/TAO/tests/Bug_2188_Regression/server.cpp @@ -66,8 +66,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(target_servant); + PortableServer::ObjectId_var id = + root_poa->activate_object (target_servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + ArrayTest_var atobj = - target_servant->_this (); + ArrayTest::_narrow (object.in ()); ServerAdmin_i *servant; ACE_NEW_RETURN (servant, ServerAdmin_i(atobj.in()),1); @@ -75,8 +80,9 @@ main (int argc, char *argv[]) // safely releases previous reference and takes ownership of this one. owner_transfer = servant; - ServerAdmin_var saobj = - servant->_this (); + id = root_poa->activate_object (servant); + object = root_poa->id_to_reference (id.in ()); + ServerAdmin_var saobj = ServerAdmin::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (saobj.in ()); diff --git a/TAO/tests/Bug_2289_Regression/client.cpp b/TAO/tests/Bug_2289_Regression/client.cpp index f208eeef8bd..e59d06f3184 100644 --- a/TAO/tests/Bug_2289_Regression/client.cpp +++ b/TAO/tests/Bug_2289_Regression/client.cpp @@ -74,8 +74,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (test_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + MyInterface_var test_ref = - test_impl->_this (); + MyInterface::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (test_ref.in ()); diff --git a/TAO/tests/Bug_2289_Regression/server.cpp b/TAO/tests/Bug_2289_Regression/server.cpp index d9ae4b85afe..d4f54cc1c1c 100644 --- a/TAO/tests/Bug_2289_Regression/server.cpp +++ b/TAO/tests/Bug_2289_Regression/server.cpp @@ -77,8 +77,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (test_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + MyInterface_var test_ref = - test_impl->_this (); + MyInterface::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (test_ref.in ()); diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp index 81cea2eef11..6b5b25a1451 100644 --- a/TAO/tests/Bug_2319_Regression/server.cpp +++ b/TAO/tests/Bug_2319_Regression/server.cpp @@ -202,7 +202,18 @@ void ST_AMH_Server::register_servant (ST_AMH_Servant *servant) { try { - Test::Roundtrip_var roundtrip = servant->_this(); + CORBA::Object_var poa_object = + this->orb_->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + PortableServer::ObjectId_var id = + root_poa->activate_object (servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Test::Roundtrip_var roundtrip = Test::Roundtrip::_narrow (object.in ()); CORBA::String_var iorstr = this->orb_->object_to_string(roundtrip.in ()); diff --git a/TAO/tests/Bug_2328_Regression/server.cpp b/TAO/tests/Bug_2328_Regression/server.cpp index 56ba330b5ea..0bbe22b1aa4 100644 --- a/TAO/tests/Bug_2328_Regression/server.cpp +++ b/TAO/tests/Bug_2328_Regression/server.cpp @@ -68,8 +68,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/Bug_2349_Regression/server.cpp b/TAO/tests/Bug_2349_Regression/server.cpp index c174c8cb0cd..9eaf0475477 100644 --- a/TAO/tests/Bug_2349_Regression/server.cpp +++ b/TAO/tests/Bug_2349_Regression/server.cpp @@ -78,7 +78,12 @@ main (int argc, char** argv) 1); PortableServer::ServantBase_var owner_transfer(server_impl); - foo_var server = server_impl->_this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + foo_var server = foo::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Bug_2417_Regression/client.cpp b/TAO/tests/Bug_2417_Regression/client.cpp index 6abecb39dac..785386807d6 100644 --- a/TAO/tests/Bug_2417_Regression/client.cpp +++ b/TAO/tests/Bug_2417_Regression/client.cpp @@ -30,9 +30,14 @@ main (int argc, char *argv[]) root_poa->the_POAManager(); Subscriber_impl subscriber(orb.in ()); - Subscriber_var subscriber_var = subscriber._this(); + PortableServer::ObjectId_var id = + root_poa->activate_object (&subscriber); - CORBA::Object_var object = orb->string_to_object("file://ior.out"); + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Subscriber_var subscriber_var = Subscriber::_narrow (object.in ()); + + object = orb->string_to_object("file://ior.out"); Publisher_var publisher = Publisher::_narrow(object.in()); publisher->subscribe(subscriber_var.in()); diff --git a/TAO/tests/Bug_2417_Regression/server.cpp b/TAO/tests/Bug_2417_Regression/server.cpp index 7743c41a9b6..98dab84b52f 100644 --- a/TAO/tests/Bug_2417_Regression/server.cpp +++ b/TAO/tests/Bug_2417_Regression/server.cpp @@ -31,7 +31,12 @@ main (int argc, char *argv[]) root_poa->the_POAManager(); Publisher_impl publisher(orb.in ()); - Publisher_var publisher_var = publisher._this(); + PortableServer::ObjectId_var id = + root_poa->activate_object (&publisher); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Publisher_var publisher_var = Publisher::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string(publisher_var.in()); ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in())); diff --git a/TAO/tests/Bug_2429_Regression/client.cpp b/TAO/tests/Bug_2429_Regression/client.cpp index 52ccddbb824..274db49b547 100644 --- a/TAO/tests/Bug_2429_Regression/client.cpp +++ b/TAO/tests/Bug_2429_Regression/client.cpp @@ -135,8 +135,13 @@ main(int argc, char *argv[]) Reply_Handler reply_handler_servant; + PortableServer::ObjectId_var id = + root_poa->activate_object (&reply_handler_servant); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + AMI_ChildHandler_var reply_handler_object = - reply_handler_servant._this (); + AMI_ChildHandler::_narrow (object_act.in ()); // Invoke the AMI parentMethod child->sendc_parentMethod (reply_handler_object.in ()); diff --git a/TAO/tests/Bug_2429_Regression/server.cpp b/TAO/tests/Bug_2429_Regression/server.cpp index 5658bcbaed4..e0087a26393 100644 --- a/TAO/tests/Bug_2429_Regression/server.cpp +++ b/TAO/tests/Bug_2429_Regression/server.cpp @@ -55,8 +55,13 @@ main (int argc, char *argv[]) ChildServant servant (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Child_var server = - servant._this (); + Child::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Bug_2494_Regression/server.cpp b/TAO/tests/Bug_2494_Regression/server.cpp index 1c58c0f1449..bec9007b319 100644 --- a/TAO/tests/Bug_2494_Regression/server.cpp +++ b/TAO/tests/Bug_2494_Regression/server.cpp @@ -84,7 +84,12 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); - Simple_Server_var server = server_impl._this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Simple_Server_var server = Simple_Server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Bug_2503_Regression/test_i.cpp b/TAO/tests/Bug_2503_Regression/test_i.cpp index c610f1d4768..4b441bf2a80 100644 --- a/TAO/tests/Bug_2503_Regression/test_i.cpp +++ b/TAO/tests/Bug_2503_Regression/test_i.cpp @@ -5,7 +5,7 @@ #include "tao/Utils/Servant_Var.h" test_i:: -test_i(CORBA::ORB_ptr orb) +test_i(CORBA::ORB_ptr orb) { this->orb_ = CORBA::ORB::_duplicate (orb); } @@ -24,7 +24,18 @@ create_and_activate_server() TAO::Utils::Servant_Var<test_i> impl( new test_i (this->orb_.in ())); - Test_var ref = impl->_this(); + CORBA::Object_var poa_object = + this->orb_->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + PortableServer::ObjectId_var id = + root_poa->activate_object (impl.in ()); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Test_var ref = Test::_narrow (object.in ()); return this->orb_->object_to_string(ref.in()); } diff --git a/TAO/tests/Bug_2560_Regression/server.cpp b/TAO/tests/Bug_2560_Regression/server.cpp index c29971ccdae..913aaf221a1 100644 --- a/TAO/tests/Bug_2560_Regression/server.cpp +++ b/TAO/tests/Bug_2560_Regression/server.cpp @@ -66,7 +66,13 @@ int main (int argc, char* argv[]) Quoter_Stock_Factory_i stock_factory_i; // Activate it to obtain the object reference - Quoter::Stock_Factory_var stock_factory = stock_factory_i._this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (&stock_factory_i); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + + Quoter::Stock_Factory_var stock_factory = + Quoter::Stock_Factory::_narrow (object_act.in ()); // Put the object reference as an IOR string CORBA::String_var ior = orb->object_to_string (stock_factory.in ()); diff --git a/TAO/tests/Bug_2593_Regression/server.cpp b/TAO/tests/Bug_2593_Regression/server.cpp index 8b9c64e5d68..fa9dc9c9b9b 100644 --- a/TAO/tests/Bug_2593_Regression/server.cpp +++ b/TAO/tests/Bug_2593_Regression/server.cpp @@ -67,8 +67,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/Bug_2595_Regression/server.cpp b/TAO/tests/Bug_2595_Regression/server.cpp index c6d906f0c61..edfe2b98049 100644 --- a/TAO/tests/Bug_2595_Regression/server.cpp +++ b/TAO/tests/Bug_2595_Regression/server.cpp @@ -67,8 +67,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/Bug_2669_Regression/client.cpp b/TAO/tests/Bug_2669_Regression/client.cpp index 36d88f5030c..bd003cf51ab 100644 --- a/TAO/tests/Bug_2669_Regression/client.cpp +++ b/TAO/tests/Bug_2669_Regression/client.cpp @@ -76,8 +76,13 @@ main (int argc, char *argv[]) ChildHandler child_handler; NonRelatedChildHandler non_related_child_handler; + PortableServer::ObjectId_var id = + poa_var->activate_object (&child_handler); + + CORBA::Object_var object = poa_var->id_to_reference (id.in ()); + ChildModule::AMI_ChildInterfaceHandler_var the_child_handler_var = - child_handler._this (); + ChildModule::AMI_ChildInterfaceHandler::_narrow (object.in ()); const char * expectedid = "IDL:child.pragma.prefix/ChildModule/AMI_ChildInterfaceHandler:1.0"; if (ACE_OS::strcmp (the_child_handler_var->_interface_repository_id (), expectedid) != 0) @@ -89,8 +94,12 @@ main (int argc, char *argv[]) } // This handler has no relationship with the above in IDL. + id = poa_var->activate_object (&non_related_child_handler); + + object = poa_var->id_to_reference (id.in ()); + AMI_ChildInterfaceHandler_var the_non_related_child_handler_var = - non_related_child_handler._this (); + AMI_ChildInterfaceHandler::_narrow (object.in ()); // Check that both handler objects narrow successfully to their parent // handler types... diff --git a/TAO/tests/Bug_2683_Regression/server.cpp b/TAO/tests/Bug_2683_Regression/server.cpp index 6f3192ee729..fe081bc045c 100644 --- a/TAO/tests/Bug_2683_Regression/server.cpp +++ b/TAO/tests/Bug_2683_Regression/server.cpp @@ -95,7 +95,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(servant); - Test::IORTable_Shutdown_Race_var target = servant->_this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Test::IORTable_Shutdown_Race_var target = + Test::IORTable_Shutdown_Race::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (target.in ()); diff --git a/TAO/tests/COIOP/COIOP_Simple_Test.cpp b/TAO/tests/COIOP/COIOP_Simple_Test.cpp index 48e1e95629f..e3c1cecba77 100644 --- a/TAO/tests/COIOP/COIOP_Simple_Test.cpp +++ b/TAO/tests/COIOP/COIOP_Simple_Test.cpp @@ -37,8 +37,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Activating POA Manager\n")); diff --git a/TAO/tests/COIOP/Server_Task.cpp b/TAO/tests/COIOP/Server_Task.cpp index 5a8b266cc06..e1ff038addc 100644 --- a/TAO/tests/COIOP/Server_Task.cpp +++ b/TAO/tests/COIOP/Server_Task.cpp @@ -50,8 +50,13 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = this->sorb_->object_to_string (hello.in ()); diff --git a/TAO/tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc b/TAO/tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc new file mode 100644 index 00000000000..85905a99a88 --- /dev/null +++ b/TAO/tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc @@ -0,0 +1,5 @@ +// -*- MPC -*- +// $Id$ + +project: taoserver { +} diff --git a/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp b/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp new file mode 100644 index 00000000000..bd54904034f --- /dev/null +++ b/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp @@ -0,0 +1,10 @@ +// +// $Id$ +// +#include "Hello.h" + +ACE_RCSID(Hello, Hello, "$Id$") + +Hello::Hello (void) +{ +} diff --git a/TAO/tests/CORBA_e_Implicit_Activation/Hello.h b/TAO/tests/CORBA_e_Implicit_Activation/Hello.h new file mode 100644 index 00000000000..b9a328eeb34 --- /dev/null +++ b/TAO/tests/CORBA_e_Implicit_Activation/Hello.h @@ -0,0 +1,21 @@ +// +// $Id$ +// + +#ifndef HELLO_H +#define HELLO_H +#include /**/ "ace/pre.h" + +#include "TestS.h" + +/// Implement the Test::Hello interface +class Hello + : public virtual POA_Test::Hello +{ +public: + /// Constructor + Hello (void); +}; + +#include /**/ "ace/post.h" +#endif /* HELLO_H */ diff --git a/TAO/tests/CORBA_e_Implicit_Activation/Test.idl b/TAO/tests/CORBA_e_Implicit_Activation/Test.idl new file mode 100644 index 00000000000..57ce97b7e5c --- /dev/null +++ b/TAO/tests/CORBA_e_Implicit_Activation/Test.idl @@ -0,0 +1,12 @@ +// +// $Id$ +// + +/// Put the interfaces in a module, to avoid global namespace pollution +module Test +{ + /// A very simple interface + interface Hello + { + }; +}; diff --git a/TAO/tests/CORBA_e_Implicit_Activation/run_test.pl b/TAO/tests/CORBA_e_Implicit_Activation/run_test.pl new file mode 100755 index 00000000000..7e700a141e8 --- /dev/null +++ b/TAO/tests/CORBA_e_Implicit_Activation/run_test.pl @@ -0,0 +1,34 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::Run_Test; + +$status = 0; + +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server"); +} +else { + $SV = new PerlACE::Process ("server"); +} + +$server = $SV->Spawn (); + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + exit 1; +} + +$server = $SV->WaitKill (10); + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; +} + +exit $status; diff --git a/TAO/tests/CORBA_e_Implicit_Activation/server.cpp b/TAO/tests/CORBA_e_Implicit_Activation/server.cpp new file mode 100644 index 00000000000..feca809fbef --- /dev/null +++ b/TAO/tests/CORBA_e_Implicit_Activation/server.cpp @@ -0,0 +1,55 @@ +// $Id$ + +#include "Hello.h" +#include "ace/OS_NS_stdio.h" + +ACE_RCSID (Hello, + server, + "$Id$") + +int +main (int argc, char *argv[]) +{ + int status = 1; + try + { + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + + CORBA::Object_var poa_object = + orb->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + if (CORBA::is_nil (root_poa.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Panic: nil RootPOA\n"), + 1); + + Hello *hello_impl = 0; + ACE_NEW_RETURN (hello_impl, + Hello (), + 1); + PortableServer::ServantBase_var owner_transfer(hello_impl); + + Test::Hello_var hello = hello_impl->_this (); + + ACE_ERROR ((LM_ERROR, + "ERROR: Implicit activation should have " + "thrown an exception with CORBA e compact.\n")); + + root_poa->destroy (1, 1); + orb->destroy (); + } + catch (const PortableServer::POA::ServantNotActive& ex) + { + ACE_DEBUG ((LM_DEBUG, "This test passes.\n")); + status = 0; + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + } + + return status; +} diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp index f8d1f09f9a6..4b6969dfb8e 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp @@ -68,8 +68,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/Cache_Growth_Test/server.cpp b/TAO/tests/Cache_Growth_Test/server.cpp index 44ffbd6f332..30c53df4407 100644 --- a/TAO/tests/Cache_Growth_Test/server.cpp +++ b/TAO/tests/Cache_Growth_Test/server.cpp @@ -65,8 +65,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/CallbackTest/client.cpp b/TAO/tests/CallbackTest/client.cpp index a80eb4a66dd..3ca4ceb70e8 100644 --- a/TAO/tests/CallbackTest/client.cpp +++ b/TAO/tests/CallbackTest/client.cpp @@ -104,8 +104,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(callback_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (callback_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Callback_var callback = - callback_impl->_this (); + Test::Callback::_narrow (object.in ()); poa_manager->activate (); diff --git a/TAO/tests/CallbackTest/server.cpp b/TAO/tests/CallbackTest/server.cpp index 12f26616f1a..f58148f9669 100644 --- a/TAO/tests/CallbackTest/server.cpp +++ b/TAO/tests/CallbackTest/server.cpp @@ -91,8 +91,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(service_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (service_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Service_var service = - service_impl->_this (); + Test::Service::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (service.in ()); diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp index a673b0eb352..ff13de5c6c5 100644 --- a/TAO/tests/Client_Leaks/Process_Factory.cpp +++ b/TAO/tests/Client_Leaks/Process_Factory.cpp @@ -29,8 +29,19 @@ Process_Factory::create_new_process (void) PortableServer::ServantBase_var owner_transfer(startup_callback_impl); + CORBA::Object_var poa_object = + this->orb_->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + PortableServer::ObjectId_var id = + root_poa->activate_object (startup_callback_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Startup_Callback_var startup_callback = - startup_callback_impl->_this (); + Test::Startup_Callback::_narrow (object.in ()); CORBA::String_var ior = this->orb_->object_to_string (startup_callback.in ()); diff --git a/TAO/tests/Client_Leaks/child.cpp b/TAO/tests/Client_Leaks/child.cpp index 34bc854f6a8..100b0b6ad4d 100644 --- a/TAO/tests/Client_Leaks/child.cpp +++ b/TAO/tests/Client_Leaks/child.cpp @@ -55,8 +55,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(process_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (process_impl); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::Process_var process = - process_impl->_this (); + Test::Process::_narrow (object_act.in ()); poa_manager->activate (); diff --git a/TAO/tests/Client_Leaks/server.cpp b/TAO/tests/Client_Leaks/server.cpp index 811bc803348..8c978062415 100644 --- a/TAO/tests/Client_Leaks/server.cpp +++ b/TAO/tests/Client_Leaks/server.cpp @@ -64,8 +64,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(process_factory_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (process_factory_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Process_Factory_var process = - process_factory_impl->_this (); + Test::Process_Factory::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (process.in ()); diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp index 66927c8d9d6..b405e62d53b 100644 --- a/TAO/tests/CodeSets/simple/server.cpp +++ b/TAO/tests/CodeSets/simple/server.cpp @@ -113,7 +113,12 @@ int main(int argc, char *argv[]) -1); // Create CORBA object for servant and REGISTER with POA - simple_var server = my_impl->_this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (my_impl); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + + simple_var server = simple::_narrow (object_act.in ()); // Get the IOR for our object CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp index e8acf3d08d7..ed01435ce1d 100644 --- a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp +++ b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp @@ -50,8 +50,13 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = this->sorb_->object_to_string (hello.in ()); diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp index c6e578fa422..fbbedfd2aa8 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp @@ -50,8 +50,13 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = this->sorb_->object_to_string (hello.in ()); diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp index 8f661b034c7..e029b7e08e7 100644 --- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp +++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp @@ -174,8 +174,13 @@ main (int argc, char *argv[]) child_poa->activate_object_with_id (base_oid.in (), base_servant); + PortableServer::ObjectId_var id_act = + root_poa->activate_object (base_servant); + + CORBA::Object_var object_act = root_poa->id_to_reference (id_act.in ()); + test_var base_test = - base_servant->_this (); + test::_narrow (object_act.in ()); test_i *first_servant = new test_i (orb.in (), @@ -189,8 +194,13 @@ main (int argc, char *argv[]) child_poa->activate_object_with_id (first_oid.in (), first_servant); + PortableServer::ObjectId_var id_actu = + root_poa->activate_object (first_servant); + + object_act = root_poa->id_to_reference (id_actu.in ()); + test_var first_test = - first_servant->_this (); + test::_narrow (object_act.in ()); base_servant->set_other (first_test.in ()); diff --git a/TAO/tests/Collocation_Tests/Server_Task.cpp b/TAO/tests/Collocation_Tests/Server_Task.cpp index 47c69723633..577e4bcc897 100644 --- a/TAO/tests/Collocation_Tests/Server_Task.cpp +++ b/TAO/tests/Collocation_Tests/Server_Task.cpp @@ -50,8 +50,13 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = this->sorb_->object_to_string (hello.in ()); diff --git a/TAO/tests/Connect_Strategy_Test/server.cpp b/TAO/tests/Connect_Strategy_Test/server.cpp index e46bdfb5c2e..e774ea9c9a6 100644 --- a/TAO/tests/Connect_Strategy_Test/server.cpp +++ b/TAO/tests/Connect_Strategy_Test/server.cpp @@ -67,8 +67,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp index a9500ec6087..5638984749d 100644 --- a/TAO/tests/Connection_Purging/server.cpp +++ b/TAO/tests/Connection_Purging/server.cpp @@ -63,8 +63,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(test_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (test_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + test_var test = - test_impl->_this (); + test::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (test.in ()); diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp index 0c7bd0f3cc0..5192c92a3db 100644 --- a/TAO/tests/Crash_On_Write/server.cpp +++ b/TAO/tests/Crash_On_Write/server.cpp @@ -65,8 +65,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(oneway_receiver_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (oneway_receiver_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Oneway_Receiver_var oneway_receiver = - oneway_receiver_impl->_this (); + Test::Oneway_Receiver::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (oneway_receiver.in ()); diff --git a/TAO/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp index e007084b933..8d99edeca1b 100644 --- a/TAO/tests/Crashed_Callback/client.cpp +++ b/TAO/tests/Crashed_Callback/client.cpp @@ -104,8 +104,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(crashed_callback_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (crashed_callback_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Crashed_Callback_var crashed_callback = - crashed_callback_impl->_this (); + Test::Crashed_Callback::_narrow (object.in ()); poa_manager->activate (); diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp index 9af16b1015c..ba57e86edae 100644 --- a/TAO/tests/Crashed_Callback/server.cpp +++ b/TAO/tests/Crashed_Callback/server.cpp @@ -91,8 +91,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(service_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (service_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Service_var service = - service_impl->_this (); + Test::Service::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (service.in ()); diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp index 22a22d3b099..f7bc2ceb483 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp @@ -53,8 +53,13 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = this->sorb_->object_to_string (hello.in ()); @@ -78,8 +83,12 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer_simple(simple_impl); + id = root_poa->activate_object (simple_impl); + + object = root_poa->id_to_reference (id.in ()); + Test::Simple_Test_var simple_test = - simple_impl->_this (); + Test::Simple_Test::_narrow (object.in ()); CORBA::String_var simple_test_ior = this->sorb_->object_to_string (simple_test.in ()); diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp index 2a252386ff0..f2f6b63c906 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp @@ -51,8 +51,13 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = this->sorb_->object_to_string (hello.in ()); @@ -76,8 +81,12 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer_simple(simple_impl); + id = root_poa->activate_object (simple_impl); + + object = root_poa->id_to_reference (id.in ()); + Test::Simple_Test_var simple_test = - simple_impl->_this (); + Test::Simple_Test::_narrow (object.in ()); CORBA::String_var simple_test_ior = this->sorb_->object_to_string (simple_test.in ()); diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp index 9a1dbb1f1f8..938eb9de2d3 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp @@ -112,7 +112,10 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) if (::parse_args (new_argc, new_argv.get_buffer ()) != 0) return -1; - CORBA::Object_var obj = this->servant_._this (); + PortableServer::ObjectId_var id = + this->poa_->activate_object (&servant_); + + CORBA::Object_var obj = this->poa_->id_to_reference (id.in ()); CORBA::String_var ior = this->orb_->object_to_string (obj.in ()); diff --git a/TAO/tests/DSI_AMI_Gateway/server.cpp b/TAO/tests/DSI_AMI_Gateway/server.cpp index 6d48cc434cb..2e1dda6c91d 100644 --- a/TAO/tests/DSI_AMI_Gateway/server.cpp +++ b/TAO/tests/DSI_AMI_Gateway/server.cpp @@ -71,8 +71,13 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Simple_Server_var server = - server_impl._this (); + Simple_Server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/DSI_Gateway/server.cpp b/TAO/tests/DSI_Gateway/server.cpp index 6d48cc434cb..2e1dda6c91d 100644 --- a/TAO/tests/DSI_Gateway/server.cpp +++ b/TAO/tests/DSI_Gateway/server.cpp @@ -71,8 +71,13 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Simple_Server_var server = - server_impl._this (); + Simple_Server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp index 4a0f81a2e56..1deb79a4052 100644 --- a/TAO/tests/Explicit_Event_Loop/server.cpp +++ b/TAO/tests/Explicit_Event_Loop/server.cpp @@ -113,7 +113,12 @@ main (int argc, char *argv[]) Time_impl time_servant; // Write its stringified reference to stdout. - Time_var tm = time_servant._this (); + PortableServer::ObjectId_var id = + poa->activate_object (&time_servant); + + CORBA::Object_var object = poa->id_to_reference (id.in ()); + + Time_var tm = Time::_narrow (object.in ()); CORBA::String_var str = orb->object_to_string (tm.in ()); diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp index 93ec78b0e0d..f9924be0828 100644 --- a/TAO/tests/FL_Cube/server.cpp +++ b/TAO/tests/FL_Cube/server.cpp @@ -77,8 +77,13 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in (), &sw); + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Simple_Server_var server = - server_impl._this (); + Simple_Server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp index 70a75db2443..21d8c75676f 100644 --- a/TAO/tests/Faults/client.cpp +++ b/TAO/tests/Faults/client.cpp @@ -108,8 +108,13 @@ main (int argc, char *argv[]) Callback_i callback_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&callback_impl); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Callback_var callback = - callback_impl._this (); + Callback::_narrow (object_act.in ()); for (int i = 0; i != niterations; ++i) { diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp index c1ea7746a00..061761b2b50 100644 --- a/TAO/tests/Faults/middle.cpp +++ b/TAO/tests/Faults/middle.cpp @@ -95,8 +95,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(middle_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (middle_impl); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Simple_Server_var middle = - middle_impl->_this (); + Simple_Server::_narrow (object_act.in ()); CORBA::String_var ior = orb->object_to_string (middle.in ()); diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp index 15a1e974215..258ae146ddb 100644 --- a/TAO/tests/Faults/ping.cpp +++ b/TAO/tests/Faults/ping.cpp @@ -82,8 +82,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(server_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + PingObject_var server = - server_impl->_this (); + PingObject::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp index 80522eda611..2103c39c8fc 100644 --- a/TAO/tests/Faults/pong.cpp +++ b/TAO/tests/Faults/pong.cpp @@ -161,8 +161,13 @@ main (int argc, char *argv[]) PingObject_i callback_impl (orb.in (), persistent_poa.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&callback_impl); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + PingObject_var callback = - callback_impl._this (); + PingObject::_narrow (object_act.in ()); // If the ior_output_file exists, output the ior to it diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp index 83d30e46590..7f3da2383f6 100644 --- a/TAO/tests/Faults/server.cpp +++ b/TAO/tests/Faults/server.cpp @@ -71,8 +71,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var server_owner_transfer(server_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Simple_Server_var server = - server_impl->_this (); + Simple_Server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp index 39a720c31ee..9f8c019e100 100644 --- a/TAO/tests/File_IO/File_i.cpp +++ b/TAO/tests/File_IO/File_i.cpp @@ -105,7 +105,12 @@ FileImpl::Descriptor::fd (void) // // Get a reference to myself - File::Descriptor_var me = this->_this (); + PortableServer::ObjectId_var id = + this->poa_->activate_object (this); + + CORBA::Object_var object_act = this->poa_->id_to_reference (id.in ()); + + File::Descriptor_var me = File::Descriptor::_narrow (object_act.in ()); // Get the ObjectId from the reference PortableServer::ObjectId_var oid1 = diff --git a/TAO/tests/Forwarding/server.cpp b/TAO/tests/Forwarding/server.cpp index 1dfcb137c5f..e99b92be337 100644 --- a/TAO/tests/Forwarding/server.cpp +++ b/TAO/tests/Forwarding/server.cpp @@ -61,8 +61,13 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Simple_Server_var server = - server_impl._this (); + Simple_Server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp index 736a5b96290..13e8f506ff6 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp @@ -65,8 +65,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var receiver_owner_transfer(payload_receiver_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (payload_receiver_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Payload_Receiver_var payload_receiver = - payload_receiver_impl->_this (); + Test::Payload_Receiver::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (payload_receiver.in ()); diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp index 8484dce2280..ea6126a7599 100644 --- a/TAO/tests/Hang_Shutdown/server.cpp +++ b/TAO/tests/Hang_Shutdown/server.cpp @@ -40,8 +40,13 @@ namespace Test 1); PortableServer::ServantBase_var owner_transfer (test_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (test_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Hang_var test = - test_impl->_this (); + Hang::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (test.in ()); diff --git a/TAO/tests/Hello/server.cpp b/TAO/tests/Hello/server.cpp index b09955c1ea2..442317e303f 100644 --- a/TAO/tests/Hello/server.cpp +++ b/TAO/tests/Hello/server.cpp @@ -66,7 +66,12 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(hello_impl); - Test::Hello_var hello = hello_impl->_this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Test::Hello_var hello = Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/ICMG_Any_Bug/Hello.cpp b/TAO/tests/ICMG_Any_Bug/Hello.cpp index 83e1d2e1a4e..ee4dac0e4d1 100644 --- a/TAO/tests/ICMG_Any_Bug/Hello.cpp +++ b/TAO/tests/ICMG_Any_Bug/Hello.cpp @@ -20,10 +20,12 @@ Hello::get_helloworld (void) HelloWorld, CORBA::NO_MEMORY ()); - PortableServer::ObjectId_var oid = - poa_->activate_object (hello_world); + PortableServer::ObjectId_var id = + this->poa_->activate_object (hello_world); - Test::HelloWorld_var hw = hello_world->_this (); + CORBA::Object_var object = this->poa_->id_to_reference (id.in ()); + + Test::HelloWorld_var hw = Test::HelloWorld::_narrow (object.in ()); return hw._retn (); } diff --git a/TAO/tests/ICMG_Any_Bug/server.cpp b/TAO/tests/ICMG_Any_Bug/server.cpp index 493fd63b985..41afe2146e6 100644 --- a/TAO/tests/ICMG_Any_Bug/server.cpp +++ b/TAO/tests/ICMG_Any_Bug/server.cpp @@ -67,8 +67,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer (hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp index fcb40029d9b..0f71b782372 100644 --- a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp +++ b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp @@ -28,7 +28,12 @@ main (int argc, char *argv[]) bogus* bogus_impl = new bogus(); PortableServer::ServantBase_var owner_transfer(bogus_impl); - Test::bogus_var b = bogus_impl->_this(); + PortableServer::ObjectId_var id = + rp->activate_object (bogus_impl); + + CORBA::Object_var object = rp->id_to_reference (id.in ()); + + Test::bogus_var b = Test::bogus::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (b.in()); diff --git a/TAO/tests/IPV6/server.cpp b/TAO/tests/IPV6/server.cpp index c6d906f0c61..edfe2b98049 100644 --- a/TAO/tests/IPV6/server.cpp +++ b/TAO/tests/IPV6/server.cpp @@ -67,8 +67,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp index dd25883f9b4..c456cc56dba 100644 --- a/TAO/tests/Leader_Followers/server.cpp +++ b/TAO/tests/Leader_Followers/server.cpp @@ -100,8 +100,13 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + test_var server = - servant._this (); + test::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/LongDouble/server.cpp b/TAO/tests/LongDouble/server.cpp index 1da21c6b08c..95cfd9a41ab 100644 --- a/TAO/tests/LongDouble/server.cpp +++ b/TAO/tests/LongDouble/server.cpp @@ -67,8 +67,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer (longDoubleTest_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (longDoubleTest_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::LongDoubleTest_var longDoubleTest = - longDoubleTest_impl->_this (); + Test::LongDoubleTest::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (longDoubleTest.in ()); diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp index 5a35e14622b..97bac4aba5b 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.cpp +++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp @@ -86,8 +86,19 @@ Worker::svc (void) &pending_requests), -1); + CORBA::Object_var poa_object = + this->orb_->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + PortableServer::ObjectId_var id = + root_poa->activate_object (handler_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + PortableServer::ServantBase_var auto_destroy (handler_impl); - handler = handler_impl->_this (); + handler = Test::AMI_ControllerHandler::_narrow (object.in ()); } validate_connection(this->controller_.in()); diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp index 4c5cb2da1cc..30095cce6fe 100644 --- a/TAO/tests/LongUpcalls/ami_client.cpp +++ b/TAO/tests/LongUpcalls/ami_client.cpp @@ -60,8 +60,13 @@ main (int argc, char *argv[]) Controller controller_impl; + PortableServer::ObjectId_var id = + root_poa->activate_object (&controller_impl); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::Controller_var controller = - controller_impl._this (); + Test::Controller::_narrow (object_act.in ()); object = orb->string_to_object (ior); @@ -75,8 +80,13 @@ main (int argc, char *argv[]) Manager_Handler handler_impl (manager.in (), controller.in ()); + + id = root_poa->activate_object (&handler_impl); + + object_act = root_poa->id_to_reference (id.in ()); + Test::AMI_ManagerHandler_var handler = - handler_impl._this (); + Test::AMI_ManagerHandler::_narrow (object_act.in ()); poa_manager->activate (); diff --git a/TAO/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp index 4b764957d95..9342b91a8ae 100644 --- a/TAO/tests/LongUpcalls/ami_server.cpp +++ b/TAO/tests/LongUpcalls/ami_server.cpp @@ -59,8 +59,13 @@ main (int argc, char *argv[]) AMI_Manager manager_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&manager_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Manager_var manager = - manager_impl._this (); + Test::Manager::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (manager.in ()); diff --git a/TAO/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp index 4a2810dc8a7..b6dacb85770 100644 --- a/TAO/tests/LongUpcalls/blocking_client.cpp +++ b/TAO/tests/LongUpcalls/blocking_client.cpp @@ -59,8 +59,13 @@ main (int argc, char *argv[]) Controller controller_impl; + PortableServer::ObjectId_var id = + root_poa->activate_object (&controller_impl); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::Controller_var controller = - controller_impl._this (); + Test::Controller::_narrow (object_act.in ()); object = orb->string_to_object (ior); diff --git a/TAO/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp index a6694164a18..4077f843241 100644 --- a/TAO/tests/LongUpcalls/blocking_server.cpp +++ b/TAO/tests/LongUpcalls/blocking_server.cpp @@ -59,8 +59,13 @@ main (int argc, char *argv[]) Manager manager_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&manager_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Manager_var manager = - manager_impl._this (); + Test::Manager::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (manager.in ()); diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp index bbc1c505ec7..3cf31dd35fd 100644 --- a/TAO/tests/MProfile/server.cpp +++ b/TAO/tests/MProfile/server.cpp @@ -64,8 +64,13 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Simple_Server_var server = - server_impl._this (); + Simple_Server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/MProfile_Connection_Timeout/server.cpp b/TAO/tests/MProfile_Connection_Timeout/server.cpp index 4721a512401..04c040ca422 100644 --- a/TAO/tests/MProfile_Connection_Timeout/server.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/server.cpp @@ -68,8 +68,13 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Simple_Server_var server = - server_impl._this (); + Simple_Server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp index ffdf32f34aa..c88f453fd53 100644 --- a/TAO/tests/MProfile_Forwarding/server.cpp +++ b/TAO/tests/MProfile_Forwarding/server.cpp @@ -64,8 +64,13 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Simple_Server_var server = - server_impl._this (); + Simple_Server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp index 724fdc4bfcc..607b7fc95c2 100644 --- a/TAO/tests/MT_BiDir/client.cpp +++ b/TAO/tests/MT_BiDir/client.cpp @@ -112,8 +112,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer (receiver); + PortableServer::ObjectId_var id = + root_poa->activate_object (receiver); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Receiver_var receiver_obj = - receiver->_this (); + Receiver::_narrow (object_act.in ()); // Send the calback object to the server sender->receiver_object (receiver_obj.in ()); diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp index f6900184a78..7cdec34d1c9 100644 --- a/TAO/tests/MT_Client/server.cpp +++ b/TAO/tests/MT_Client/server.cpp @@ -60,8 +60,13 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Simple_Server_var server = - server_impl._this (); + Simple_Server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp index 046252f3247..909e398c68d 100644 --- a/TAO/tests/MT_Server/server.cpp +++ b/TAO/tests/MT_Server/server.cpp @@ -87,8 +87,13 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Simple_Server_var server = - server_impl._this (); + Simple_Server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp index 89d189e6969..f7a47c804b0 100644 --- a/TAO/tests/MT_Timeout/server.cpp +++ b/TAO/tests/MT_Timeout/server.cpp @@ -64,8 +64,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(sleep_service_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (sleep_service_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Sleep_Service_var process = - sleep_service_impl->_this (); + Test::Sleep_Service::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (process.in ()); diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp index 01275412a9e..7ed7d823af7 100644 --- a/TAO/tests/Multiple/server.cpp +++ b/TAO/tests/Multiple/server.cpp @@ -33,7 +33,13 @@ int main (int argc, char *argv[]) // Create the CORBA Object that is incarnated by the // delegated servant. - Multiple::Bottom_var bottom = delegated_servant._this (); + PortableServer::ObjectId_var id = + poa->activate_object (&delegated_servant); + + CORBA::Object_var object_act = poa->id_to_reference (id.in ()); + + Multiple::Bottom_var bottom = + Multiple::Bottom::_narrow (object_act.in ()); // Now we stringfy the object reference. CORBA::String_var ior = diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp index 383a1dd9e15..0ac500a4cc4 100644 --- a/TAO/tests/Muxed_GIOP_Versions/server.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp @@ -151,8 +151,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(server_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Simple_Server_var server = - server_impl->_this (); + Simple_Server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp index 90cfdfdf5f5..b10aa4b7bbb 100644 --- a/TAO/tests/Muxing/server.cpp +++ b/TAO/tests/Muxing/server.cpp @@ -64,8 +64,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (receiver_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Receiver_var receiver = - receiver_impl->_this (); + Test::Receiver::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (receiver.in ()); diff --git a/TAO/tests/Native_Exceptions/server.cpp b/TAO/tests/Native_Exceptions/server.cpp index 7d3546f8cea..3d86811190e 100644 --- a/TAO/tests/Native_Exceptions/server.cpp +++ b/TAO/tests/Native_Exceptions/server.cpp @@ -56,8 +56,13 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Simple_Server_var server = - server_impl._this (); + Simple_Server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp index 9a6d581df91..6e8aa3aee3a 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp @@ -260,10 +260,18 @@ MT_Server::run_ORB_briefly (void) "(%P|%t) MT_Server::run: " "going to call distant MT Object\n")); + PortableServer::POA_var root_poa = + this->orb_manager_ptr_->root_poa (); + for (unsigned int i = 0; i < this->iterations_; i++) { + PortableServer::ObjectId_var id = + root_poa->activate_object (&mT_Object_i_); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + MT_Object_var tmp = - this->mT_Object_i_._this (); + MT_Object::_narrow (object_act.in ()); this->mT_Object_var_->yadda (0, tmp.in ()); diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp index 63b9bdd4b8e..90152bf511b 100644 --- a/TAO/tests/NestedUpcall/Simple/client.cpp +++ b/TAO/tests/NestedUpcall/Simple/client.cpp @@ -141,7 +141,12 @@ main (int argc, client_i client_servant (quiet, server.in ()); - client_var client_object = client_servant._this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (&client_servant); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + + client_var client_object = client::_narrow (object_act.in ()); Client_Task client_tasks (client_object.in (), server.in ()); diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp index 7c16c359b2a..cecdab57937 100644 --- a/TAO/tests/NestedUpcall/Simple/server.cpp +++ b/TAO/tests/NestedUpcall/Simple/server.cpp @@ -137,7 +137,12 @@ main (int argc, server_i server_servant (quiet, orb.in ()); - server_var server_object = server_servant._this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_servant); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + + server_var server_object = server::_narrow (object_act.in ()); CORBA::String_var ior = orb->object_to_string (server_object.in ()); diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp index 40ac866ae9a..756ad7811fd 100644 --- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp +++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp @@ -150,7 +150,12 @@ main (int argc, client_i client_servant (quiet, server.in ()); - client_var client_object = client_servant._this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (&client_servant); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + + client_var client_object = client::_narrow (object_act.in ()); Client_Task client_tasks (client_object.in (), server.in ()); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp index 412b73befa7..7dbfa16c165 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp @@ -227,8 +227,14 @@ Initiator_Server::run (void) "Initiator_Server::run: Trying to invoke " "foo on Object A\n")); + PortableServer::POA_var root_poa = this->orb_manager_.root_poa (); + PortableServer::ObjectId_var id = + root_poa->activate_object (initiator_i_ptr_); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Initiator_var initiator = - this->initiator_i_ptr_->_this(); + Initiator::_narrow (object_act.in ()); this->object_A_var_->foo (initiator.in ()); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp index 04113692445..2b58d545409 100644 --- a/TAO/tests/Nested_Event_Loop/server.cpp +++ b/TAO/tests/Nested_Event_Loop/server.cpp @@ -59,8 +59,13 @@ main (int argc, char *argv[]) server_i servant (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + server_var server_object = - servant._this (); + server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server_object.in ()); diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp index 798b9912660..77d95d9c499 100644 --- a/TAO/tests/Nested_Event_Loop/test_i.cpp +++ b/TAO/tests/Nested_Event_Loop/test_i.cpp @@ -151,7 +151,7 @@ client_i::oneway_no_op (const act &act_for_iterations, } catch (const CORBA::Exception& ex) { - ex._tao_print_exception ("Exception caught in client_i::no_op:"); + ex._tao_print_exception ("Exception caught in client_i::oneway_no_op:"); } } diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp index d1c51b21892..baa02e4d07a 100644 --- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp +++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp @@ -35,8 +35,19 @@ Client_Peer::callme(Test::Peer_ptr callback, // ACE_DEBUG ((LM_DEBUG, "Received call, depth = %d\n", max_depth)); if (max_depth > 0) { + CORBA::Object_var poa_object = + this->orb_->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + PortableServer::ObjectId_var id = + root_poa->activate_object (this); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Peer_var me = - this->_this(); + Test::Peer::_narrow (object.in ()); Test::Payload return_data; diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp index bbb3983883c..7970d7df3f8 100644 --- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp +++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp @@ -48,8 +48,19 @@ Server_Peer::callme(Test::Peer_ptr callback, } else if (max_depth > 0) { + CORBA::Object_var poa_object = + this->orb_->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + PortableServer::ObjectId_var id = + root_poa->activate_object (this); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Peer_var me = - this->_this(); + Test::Peer::_narrow (object.in ()); Test::Payload extra_data(this->payload_size_); extra_data.length(this->payload_size_); diff --git a/TAO/tests/Nested_Upcall_Crash/client.cpp b/TAO/tests/Nested_Upcall_Crash/client.cpp index 12762a23219..7bbefc3538e 100644 --- a/TAO/tests/Nested_Upcall_Crash/client.cpp +++ b/TAO/tests/Nested_Upcall_Crash/client.cpp @@ -83,8 +83,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (impl); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::Peer_var local_peer = - impl->_this (); + Test::Peer::_narrow (object_act.in ()); CORBA::Object_var tmp = orb->string_to_object(ior); diff --git a/TAO/tests/Nested_Upcall_Crash/server.cpp b/TAO/tests/Nested_Upcall_Crash/server.cpp index eb7ee10ae8c..a937ed21856 100644 --- a/TAO/tests/Nested_Upcall_Crash/server.cpp +++ b/TAO/tests/Nested_Upcall_Crash/server.cpp @@ -91,8 +91,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (impl); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test::Peer_var peer = - impl->_this (); + Test::Peer::_narrow (object_act.in ()); CORBA::String_var ior = orb->object_to_string (peer.in ()); diff --git a/TAO/tests/No_Server_MT_Connect_Test/server.cpp b/TAO/tests/No_Server_MT_Connect_Test/server.cpp index f6900184a78..7cdec34d1c9 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/server.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/server.cpp @@ -60,8 +60,13 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Simple_Server_var server = - server_impl._this (); + Simple_Server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/OBV/Any/server.cpp b/TAO/tests/OBV/Any/server.cpp index ad7267ce608..7c4ecab09c8 100644 --- a/TAO/tests/OBV/Any/server.cpp +++ b/TAO/tests/OBV/Any/server.cpp @@ -66,8 +66,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (test_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + OBV_AnyTest::Test_var test = - test_impl->_this (); + OBV_AnyTest::Test::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (test.in ()); diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp index 0487ad694e6..35b9b4b64bb 100644 --- a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp @@ -81,7 +81,12 @@ Server_Task::svc (void) PortableServer::ServantBase_var owner_transfer(test_impl); - Test_var test = test_impl->_this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (test_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Test_var test = Test::_narrow (object.in ()); CORBA::String_var ior = this->sorb_->object_to_string (test.in ()); diff --git a/TAO/tests/OBV/Factory/server.cpp b/TAO/tests/OBV/Factory/server.cpp index a4d2933e3d9..1a04f156a47 100644 --- a/TAO/tests/OBV/Factory/server.cpp +++ b/TAO/tests/OBV/Factory/server.cpp @@ -66,8 +66,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (test_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + OBV_FactoryTest::Test_var test = - test_impl->_this (); + OBV_FactoryTest::Test::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (test.in ()); diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp index cffe16e5f2d..cdefd70720a 100644 --- a/TAO/tests/OBV/Forward/server.cpp +++ b/TAO/tests/OBV/Forward/server.cpp @@ -105,7 +105,12 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); - Test_var test = test_impl->_this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (test_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Test_var test = Test::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (test.in ()); diff --git a/TAO/tests/OBV/TC_Alignment/server.cpp b/TAO/tests/OBV/TC_Alignment/server.cpp index 8d7bc50a35d..c054a76d96c 100644 --- a/TAO/tests/OBV/TC_Alignment/server.cpp +++ b/TAO/tests/OBV/TC_Alignment/server.cpp @@ -37,8 +37,13 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + test_var server = - servant._this (); + test::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/OBV/Truncatable/server.cpp b/TAO/tests/OBV/Truncatable/server.cpp index 038c9f07822..6dc002a6ff3 100644 --- a/TAO/tests/OBV/Truncatable/server.cpp +++ b/TAO/tests/OBV/Truncatable/server.cpp @@ -67,8 +67,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (test_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + OBV_TruncatableTest::Test_var test = - test_impl->_this (); + OBV_TruncatableTest::Test::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (test.in ()); diff --git a/TAO/tests/OBV/ValueBox/server.cpp b/TAO/tests/OBV/ValueBox/server.cpp index 69a99367159..1c67935ce6b 100644 --- a/TAO/tests/OBV/ValueBox/server.cpp +++ b/TAO/tests/OBV/ValueBox/server.cpp @@ -69,7 +69,12 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); - Test_var test = test_impl->_this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (test_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Test_var test = Test::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (test.in ()); diff --git a/TAO/tests/ORB_shutdown/server.cpp b/TAO/tests/ORB_shutdown/server.cpp index 204713272a5..09d6d131320 100644 --- a/TAO/tests/ORB_shutdown/server.cpp +++ b/TAO/tests/ORB_shutdown/server.cpp @@ -35,8 +35,13 @@ main (int argc, char *argv[]) Foo_Bar (orb.in ()), 1); + PortableServer::ObjectId_var id = + root_poa->activate_object (foobar_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Foo_var foo = - foobar_impl->_this (); + Test::Foo::_narrow (object.in ()); poa_manager->activate (); diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp index 245b041521a..d2b65e64926 100644 --- a/TAO/tests/Object_Loader/Loader.cpp +++ b/TAO/tests/Object_Loader/Loader.cpp @@ -31,6 +31,9 @@ Loader::create_object (CORBA::ORB_ptr orb, ACE_NEW_RETURN (test, Test_i (poa.in ()), CORBA::Object::_nil ()); + PortableServer::ObjectId_var id = + poa->activate_object (test); + PortableServer::ServantBase_var tmp = test; obj = test->_this (); diff --git a/TAO/tests/Object_Loader/driver.cpp b/TAO/tests/Object_Loader/driver.cpp index 5584458efcb..f0803cc6e7f 100644 --- a/TAO/tests/Object_Loader/driver.cpp +++ b/TAO/tests/Object_Loader/driver.cpp @@ -33,6 +33,13 @@ main (int, char *[]) Test_var test = Test::_narrow (object.in ()); + if (CORBA::is_nil (test.in ())) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Nil object reference.\n"), + 1); + } + CORBA::Long count = test->instance_count (); diff --git a/TAO/tests/Object_Loader/run_test.pl b/TAO/tests/Object_Loader/run_test.pl index a64f5db6b2c..e31aab99870 100755 --- a/TAO/tests/Object_Loader/run_test.pl +++ b/TAO/tests/Object_Loader/run_test.pl @@ -10,11 +10,7 @@ use English; use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; -if ($OSNAME eq "MSWin32") { - $ENV{'PATH'} .= ';'.$PerlACE::Process::ExeSubDir; -} else { - $ENV{'PATH'} .= ':'.$PerlACE::Process::ExeSubDir; -} +PerlACE::add_lib_path ($PerlACE::Process::ExeSubDir); $T = new PerlACE::Process ("driver"); diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp index 04d6a413ec9..599ae7518dd 100644 --- a/TAO/tests/Objref_Sequence_Test/server.cpp +++ b/TAO/tests/Objref_Sequence_Test/server.cpp @@ -174,8 +174,13 @@ main (int argc, char *argv []) PortableServer::ServantBase_var owner_transfer(servant); + PortableServer::ObjectId_var id = + root_poa->activate_object (servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Server_var server = - servant->_this (); + Server::_narrow (object.in ()); // Announce the server CORBA::String_var obj_ref = diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp index b310ad9d055..26bec5a3f65 100644 --- a/TAO/tests/OctetSeq/server.cpp +++ b/TAO/tests/OctetSeq/server.cpp @@ -64,8 +64,13 @@ main (int argc, char *argv[]) Database_i server_impl (orb.in (), 128); // @@ TODO + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Database_var server = - server_impl._this (); + Test::Database::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Ondemand_Write/server.cpp b/TAO/tests/Ondemand_Write/server.cpp index c6d906f0c61..edfe2b98049 100644 --- a/TAO/tests/Ondemand_Write/server.cpp +++ b/TAO/tests/Ondemand_Write/server.cpp @@ -67,8 +67,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp index e096b0ade99..0111f9cc430 100644 --- a/TAO/tests/Oneway_Buffering/admin.cpp +++ b/TAO/tests/Oneway_Buffering/admin.cpp @@ -65,8 +65,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(oneway_buffering_admin_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (oneway_buffering_admin_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Oneway_Buffering_Admin_var oneway_buffering_admin = - oneway_buffering_admin_impl->_this (); + Test::Oneway_Buffering_Admin::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (oneway_buffering_admin.in ()); diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp index 594c40cea30..cd3fa337886 100644 --- a/TAO/tests/Oneway_Buffering/server.cpp +++ b/TAO/tests/Oneway_Buffering/server.cpp @@ -86,8 +86,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(oneway_buffering_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (oneway_buffering_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Oneway_Buffering_var oneway_buffering = - oneway_buffering_impl->_this (); + Test::Oneway_Buffering::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (oneway_buffering.in ()); diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp index a0f87129eab..6222cdd906f 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/client.cpp @@ -83,8 +83,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (receiver_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Receiver_var receiver = - receiver_impl->_this (); + Test::Receiver::_narrow (object.in ()); // Activate poa manager poa_manager->activate (); diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp index f6ef621df6e..62ae3d6eb7a 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/server.cpp @@ -65,8 +65,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var receiver_owner_transfer(sender_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (sender_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Sender_var sender = - sender_impl->_this (); + Test::Sender::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (sender.in ()); diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp index 36589971b19..2dbf1e8d086 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp @@ -137,8 +137,10 @@ test_object_deactivation (PortableServer::POA_ptr poa, servant.id_ = id; + CORBA::Object_var object = poa->id_to_reference (id); + test_var test = - servant._this (); + test::_narrow (object.in ()); test->deactivate_self (); diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp index af13f7107c1..aafac254c93 100644 --- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp +++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp @@ -231,9 +231,18 @@ main (int argc, char **argv) ACE_Auto_Event event2; test_i servant2 (event2); - test_var test_object1 = servant1._this (); + PortableServer::ObjectId_var id_act = + root_poa->activate_object (&servant1); - test_var test_object2 = servant2._this (); + CORBA::Object_var object_act = root_poa->id_to_reference (id_act.in ()); + + test_var test_object1 = test::_narrow (object_act.in ()); + + id_act = root_poa->activate_object (&servant2); + + object_act = root_poa->id_to_reference (id_act.in ()); + + test_var test_object2 = test::_narrow (object_act.in ()); PortableServer::ObjectId_var id1 = root_poa->reference_to_id (test_object1.in ()); diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp index 1a55e2655b0..501e0aa3bfd 100644 --- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp +++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp @@ -63,7 +63,12 @@ main (int argc, char **argv) test_i servant; - test_var test_object = servant._this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + + test_var test_object = test::_narrow (object_act.in ()); test_object->destroy_poa (); } diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp index 0c6a6904565..49190449ec2 100644 --- a/TAO/tests/POA/Persistent_ID/server.cpp +++ b/TAO/tests/POA/Persistent_ID/server.cpp @@ -133,8 +133,13 @@ test_i::create_POA (void) servant); } + PortableServer::ObjectId_var id = + this->poa_->activate_object (servant); + + CORBA::Object_var object = this->poa_->id_to_reference (id.in ()); + test_var test = - servant->_this (); + test::_narrow (object.in ()); return test._retn (); } @@ -228,8 +233,13 @@ main (int argc, char **argv) test_i servant (orb.in (), root_poa.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + test_var test = - servant._this (); + test::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (test.in ()); diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp index 7805df22d59..d3ec07ddcb5 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp +++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp @@ -61,7 +61,12 @@ test_i::method (void) ACE_DEBUG ((LM_DEBUG, "Calling self from %t\n")); - test_var self = this->_this (); + PortableServer::ObjectId_var id = + this->poa_->activate_object (this); + + CORBA::Object_var object = this->poa_->id_to_reference (id.in ()); + + test_var self = test::_narrow (object.in ()); self->method (); } @@ -154,9 +159,18 @@ main (int argc, char **argv) test_i servant1 (child_poa.in ()); test_i servant2 (child_poa.in ()); - test_var object1 = servant1._this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant1); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + + test_var object1 = test::_narrow (object_act.in ()); + + id = root_poa->activate_object (&servant2); + + object_act = root_poa->id_to_reference (id.in ()); - test_var object2 = servant2._this (); + test_var object2 = test::_narrow (object_act.in ()); Worker worker1 (object1.in ()); Worker worker2 (object2.in ()); diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp index 63628a5be4c..10279067e6c 100644 --- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp +++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp @@ -88,7 +88,12 @@ main (int argc, "second ORB"); test_i servant; - test_var test_object = servant._this (); + PortableServer::ObjectId_var id = + first_poa->activate_object (&servant); + + CORBA::Object_var object_act = first_poa->id_to_reference (id.in ()); + + test_var test_object = test::_narrow (object_act.in ()); int expected_exception_raised = 0; diff --git a/TAO/tests/Parallel_Connect_Strategy/server.cpp b/TAO/tests/Parallel_Connect_Strategy/server.cpp index 5315d5c506e..aae9f2a6bfc 100644 --- a/TAO/tests/Parallel_Connect_Strategy/server.cpp +++ b/TAO/tests/Parallel_Connect_Strategy/server.cpp @@ -68,8 +68,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = diff --git a/TAO/tests/Portable_Interceptors/AMI/server.cpp b/TAO/tests/Portable_Interceptors/AMI/server.cpp index 5c1b078b633..1806edc7ff5 100644 --- a/TAO/tests/Portable_Interceptors/AMI/server.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/server.cpp @@ -77,8 +77,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(echo_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (echo_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Echo_var echo = - echo_impl->_this (); + Test::Echo::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (echo.in ()); diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp index 6c5f5825295..98da1770179 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp @@ -162,7 +162,12 @@ main (int argc, char *argv[]) StateTransferImpl* impl = new StateTransferImpl (orb.in ()); ServantBase_var impl_var (impl); - StateTransfer_var ref (impl->_this ()); + PortableServer::ObjectId_var id_act = + root_poa->activate_object (impl); + + CORBA::Object_var object = root_poa->id_to_reference (id_act.in ()); + + StateTransfer_var ref = StateTransfer::_narrow (object.in ()); String_var ior (orb->object_to_string (ref.in ())); poa_manager->activate (); diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp index 729804b2872..d0072b2869e 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp @@ -289,7 +289,12 @@ main (int argc, char *argv[]) InvokeMeImpl* impl = new InvokeMeImpl (orb.in ()); ServantBase_var impl_var (impl); - InvokeMe_var ref (impl->_this ()); + PortableServer::ObjectId_var id_act = + root_poa->activate_object (impl); + + CORBA::Object_var object = root_poa->id_to_reference (id_act.in ()); + + InvokeMe_var ref = InvokeMe::_narrow (object.in ()); String_var ior (orb->object_to_string (ref.in ())); poa_manager->activate (); diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp index 780cad1d12a..9b2116de073 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp @@ -205,7 +205,12 @@ main (int argc, char *argv[]) StateTransferImpl* impl = new StateTransferImpl (orb.in ()); ServantBase_var impl_var (impl); - StateTransfer_var ref (impl->_this ()); + PortableServer::ObjectId_var id_act = + root_poa->activate_object (impl); + + CORBA::Object_var object = root_poa->id_to_reference (id_act.in ()); + + StateTransfer_var ref = StateTransfer::_narrow (object.in ()); String_var ior (orb->object_to_string (ref.in ())); poa_manager->activate (); diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp index 8c92a58148a..6b1ff730487 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp @@ -80,8 +80,13 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + CORBA::Object_var obj = - servant._this (); + CORBA::Object::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (obj.in ()); diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp index af3dcc1edfd..2c3231422ee 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp @@ -42,8 +42,19 @@ test_i::invoke_me (void) // By this point all of step 1 has occurred. Step 2 will now // occur. + CORBA::Object_var poa_object = + this->orb_->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + PortableServer::ObjectId_var id = + root_poa->activate_object (this); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + PICurrentTest::test_var my_ref = - this->_this (); + PICurrentTest::test::_narrow (object.in ()); // ---------------------------------------------------- diff --git a/TAO/tests/Portable_Interceptors/Redirection/server.cpp b/TAO/tests/Portable_Interceptors/Redirection/server.cpp index 4fc9c966cd7..b335e156a30 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/server.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/server.cpp @@ -86,8 +86,13 @@ main (int argc, char *argv[]) ACE_NEW_RETURN (test_impl, test_i (number, orb.in ()), 1); PortableServer::ServantBase_var owner_transfer (test_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (test_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + RedirectionTest::test_var test = - test_impl->_this (); + RedirectionTest::test::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (test.in ()); diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp index d8d4fd6b79a..75b41080f27 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp @@ -79,7 +79,12 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); - CORBA::Object_var obj = servant._this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + CORBA::Object_var obj = CORBA::Object::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (obj.in ()); diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp index a4f68600b63..99bd2ba6579 100644 --- a/TAO/tests/QtTests/server.cpp +++ b/TAO/tests/QtTests/server.cpp @@ -80,8 +80,13 @@ main (int argc, char *argv[]) // Instantiate the LCD_Display implementation class LCD_Display_imp display_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&display_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + LCD_Display_var server = - display_impl._this (); + LCD_Display::_narrow (object.in ()); // Create the LCD after the QVbox is created. QVBox box; diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp index 384c3944762..d8f555fc6e1 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp @@ -136,8 +136,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, PortableServer::ServantBase_var safe_servant (servant); ACE_UNUSED_ARG (safe_servant); + PortableServer::ObjectId_var id = + root_poa->activate_object (servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + test_var test = - servant->_this (); + test::_narrow (object.in ()); int result = write_ior_to_file (orb, @@ -198,8 +203,13 @@ Task::svc (void) test_i servant (this->orb_.in (), root_poa.in (), nap_time); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + test_var test = - servant._this (); + test::_narrow (object_act.in ()); int result = write_ior_to_file (this->orb_.in (), diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp index 9270eade5ab..3e125e8728e 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp @@ -226,8 +226,13 @@ Task::svc (void) PortableServer::ServantBase_var safe_servant (servant); + PortableServer::ObjectId_var id = + root_poa->activate_object (servant); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + test_var test = - servant->_this (); + test::_narrow (object_act.in ()); write_iors_to_file (test.in (), this->orb_.in (), diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index 72919678638..b5207a64b70 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -267,8 +267,13 @@ server::test_root_poa (void) PortableServer::ServantBase_var safe_servant (servant); + PortableServer::ObjectId_var id = + this->root_poa_->activate_object (servant); + + CORBA::Object_var object_act = this->root_poa_->id_to_reference (id.in ()); + test_var test = - servant->_this (); + test::_narrow (object_act.in ()); write_iors_to_file (test.in (), this->orb_.in (), @@ -298,8 +303,13 @@ server::test_child_poa (void) PortableServer::ServantBase_var safe_servant (servant); + PortableServer::ObjectId_var id = + poa->activate_object (servant); + + CORBA::Object_var object_act = poa->id_to_reference (id.in ()); + test_var test = - servant->_this (); + test::_narrow (object_act.in ()); write_iors_to_file (test.in (), this->orb_.in (), diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp index bdb6107a94c..25b1eb775db 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp @@ -137,8 +137,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, PortableServer::ServantBase_var safe_servant (servant); ACE_UNUSED_ARG (safe_servant); + PortableServer::ObjectId_var id = + root_poa->activate_object (servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + test_var test = - servant->_this (); + test::_narrow (object.in ()); int const result = write_ior_to_file (orb, diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp index e392cf5dc5b..970deecd605 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp @@ -189,8 +189,13 @@ vanilla_poa (CORBA::ORB_ptr orb, PortableServer::ServantBase_var safe_servant (servant); + PortableServer::ObjectId_var id_act = + root_poa->activate_object (servant); + + CORBA::Object_var object = root_poa->id_to_reference (id_act.in ()); + test_var test = - servant->_this (); + test::_narrow (object.in ()); write_iors_to_file (test.in (), orb); @@ -268,8 +273,13 @@ rt_poa (CORBA::ORB_ptr orb, PortableServer::ServantBase_var safe_servant (servant); + PortableServer::ObjectId_var id_act = + root_poa->activate_object (servant); + + CORBA::Object_var object = root_poa->id_to_reference (id_act.in ()); + test_var test = - servant->_this (); + test::_narrow (object.in ()); write_iors_to_file (test.in (), orb); diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp index dcf82a74e24..b480ef7b4d4 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp @@ -137,8 +137,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, PortableServer::ServantBase_var safe_servant (servant); ACE_UNUSED_ARG (safe_servant); + PortableServer::ObjectId_var id = + root_poa->activate_object (servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + test_var test = - servant->_this (); + test::_narrow (object.in ()); int result = write_ior_to_file (orb, @@ -199,8 +204,13 @@ Task::svc (void) test_i servant (this->orb_.in (), root_poa.in (), nap_time); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + test_var test = - servant._this (); + test::_narrow (object_act.in ()); int result = write_ior_to_file (this->orb_.in (), diff --git a/TAO/tests/Reliable_Oneways/server.cpp b/TAO/tests/Reliable_Oneways/server.cpp index 654262df8a6..3bc0fe20fe1 100644 --- a/TAO/tests/Reliable_Oneways/server.cpp +++ b/TAO/tests/Reliable_Oneways/server.cpp @@ -65,8 +65,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(oneway_receiver_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (oneway_receiver_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Oneway_Receiver_var oneway_receiver = - oneway_receiver_impl->_this (); + Test::Oneway_Receiver::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (oneway_receiver.in ()); diff --git a/TAO/tests/Server_Connection_Purging/server.cpp b/TAO/tests/Server_Connection_Purging/server.cpp index 55e7437982e..3cc5badc07f 100644 --- a/TAO/tests/Server_Connection_Purging/server.cpp +++ b/TAO/tests/Server_Connection_Purging/server.cpp @@ -59,8 +59,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(test_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (test_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + test_var test = - test_impl->_this (); + test::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (test.in ()); diff --git a/TAO/tests/Server_Leaks/server.cpp b/TAO/tests/Server_Leaks/server.cpp index a098c68863f..c82291b31e3 100644 --- a/TAO/tests/Server_Leaks/server.cpp +++ b/TAO/tests/Server_Leaks/server.cpp @@ -64,8 +64,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(ping_service_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (ping_service_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Ping_Service_var ping_service = - ping_service_impl->_this (); + Test::Ping_Service::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (ping_service.in ()); diff --git a/TAO/tests/Server_Port_Zero/server.cpp b/TAO/tests/Server_Port_Zero/server.cpp index 68e787cd3b2..9e1c21bb333 100644 --- a/TAO/tests/Server_Port_Zero/server.cpp +++ b/TAO/tests/Server_Port_Zero/server.cpp @@ -67,8 +67,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var owner_transfer(hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Hello_var hello = - hello_impl->_this (); + Test::Hello::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (hello.in ()); diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp index fe5f4460bcb..8746e3d7178 100644 --- a/TAO/tests/Single_Read/server.cpp +++ b/TAO/tests/Single_Read/server.cpp @@ -58,8 +58,13 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + test_var server = - servant._this (); + test::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp index 4b33f9d0ff3..126fc241449 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp @@ -116,8 +116,13 @@ main (int argc, char *argv[]) PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test_var Test_object = - servant._this (); + Test::_narrow (object_act.in ()); CORBA::String_var ior = orb->object_to_string (Test_object.in ()); diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp index 5e83ca06fb9..4d54b7d9204 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp @@ -113,8 +113,13 @@ main (int argc, char *argv[]) PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test_var Test_object = - servant._this (); + Test::_narrow (object_act.in ()); CORBA::String_var ior = orb->object_to_string (Test_object.in ()); diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp index 3f1b759f5a6..149739da9ee 100644 --- a/TAO/tests/Smart_Proxies/Policy/server.cpp +++ b/TAO/tests/Smart_Proxies/Policy/server.cpp @@ -113,8 +113,13 @@ main (int argc, char *argv[]) PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test_var Test_object = - servant._this (); + Test::_narrow (object_act.in ()); CORBA::String_var ior = orb->object_to_string (Test_object.in ()); diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp index 5c0fadca6dc..68448d85eba 100644 --- a/TAO/tests/Smart_Proxies/server.cpp +++ b/TAO/tests/Smart_Proxies/server.cpp @@ -113,8 +113,13 @@ main (int argc, char *argv[]) PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Test_var Test_object = - servant._this (); + Test::_narrow (object_act.in ()); CORBA::String_var ior = orb->object_to_string (Test_object.in ()); diff --git a/TAO/tests/Stack_Recursion/server.cpp b/TAO/tests/Stack_Recursion/server.cpp index 53760698d4a..48b7f6c363a 100644 --- a/TAO/tests/Stack_Recursion/server.cpp +++ b/TAO/tests/Stack_Recursion/server.cpp @@ -66,8 +66,13 @@ main (int argc, char *argv[]) 1); PortableServer::ServantBase_var receiver_owner_transfer(sender_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (sender_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Test::Sender_var sender = - sender_impl->_this (); + Test::Sender::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (sender.in ()); diff --git a/TAO/tests/Strategies/server.cpp b/TAO/tests/Strategies/server.cpp index 1221afaed41..f80e008049c 100644 --- a/TAO/tests/Strategies/server.cpp +++ b/TAO/tests/Strategies/server.cpp @@ -60,8 +60,13 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Simple_Server_var server = - server_impl._this (); + Simple_Server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp index 040327785a9..35ef40177d5 100644 --- a/TAO/tests/Timed_Buffered_Oneways/server.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/server.cpp @@ -58,8 +58,13 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&servant); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + test_var server = - servant._this (); + test::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Timeout/server.cpp b/TAO/tests/Timeout/server.cpp index 4eb692eb8b6..92196824db9 100644 --- a/TAO/tests/Timeout/server.cpp +++ b/TAO/tests/Timeout/server.cpp @@ -62,8 +62,13 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Simple_Server_var server = - server_impl._this (); + Simple_Server::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/Two_Objects/Object_Factory_i.cpp b/TAO/tests/Two_Objects/Object_Factory_i.cpp index 06baee28d6e..107826a2312 100644 --- a/TAO/tests/Two_Objects/Object_Factory_i.cpp +++ b/TAO/tests/Two_Objects/Object_Factory_i.cpp @@ -27,8 +27,19 @@ Object_Factory_i::create_first (void) First_i (orb_.in(), two_way_done_ ), CORBA::NO_MEMORY() ); + CORBA::Object_var poa_object = + this->orb_->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + PortableServer::ObjectId_var id = + root_poa->activate_object (first_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Two_Objects_Test::First_var first = - first_impl->_this ( ); + Two_Objects_Test::First::_narrow (object.in ()); return first._retn(); } @@ -44,8 +55,19 @@ Object_Factory_i::create_second (void) length_, two_way_done_), CORBA::NO_MEMORY ()); + CORBA::Object_var poa_object = + this->orb_->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + PortableServer::ObjectId_var id = + root_poa->activate_object (second_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Two_Objects_Test::Second_var second = - second_impl->_this (); + Two_Objects_Test::Second::_narrow (object.in ()); return second._retn(); } diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp index aa55995dfa3..34fdb2a1686 100644 --- a/TAO/tests/Two_Objects/server.cpp +++ b/TAO/tests/Two_Objects/server.cpp @@ -96,8 +96,13 @@ main (int argc, char *argv[]) // _this method registers the object withe the POA and returns // an object reference + PortableServer::ObjectId_var id = + root_poa->activate_object (factory_impl); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + Two_Objects_Test::Object_Factory_var factory = - factory_impl->_this (); + Two_Objects_Test::Object_Factory::_narrow (object_act.in ()); // Convert the object reference to a string so that it can // be saved in a file and used by clinet programs later diff --git a/TAO/tests/Typedef_String_Array/server.cpp b/TAO/tests/Typedef_String_Array/server.cpp index 4a30e919e4f..de731d5cc49 100644 --- a/TAO/tests/Typedef_String_Array/server.cpp +++ b/TAO/tests/Typedef_String_Array/server.cpp @@ -60,7 +60,12 @@ main (int argc, char *argv[]) TestImpl test_impl (orb.in ()); - SimpleStrings_var server = test_impl._this (); + PortableServer::ObjectId_var id = + root_poa->activate_object (&test_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + SimpleStrings_var server = SimpleStrings::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp index 5e7a8cc56be..fb61a039766 100644 --- a/TAO/tests/UNKNOWN_Exception/server.cpp +++ b/TAO/tests/UNKNOWN_Exception/server.cpp @@ -131,8 +131,19 @@ test_factory_i::create_test (void) PortableServer::ServantBase_var safe_servant (servant); ACE_UNUSED_ARG (safe_servant); + CORBA::Object_var poa_object = + this->orb_->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + PortableServer::ObjectId_var id_act = + root_poa->activate_object (servant); + + CORBA::Object_var object = root_poa->id_to_reference (id_act.in ()); + test_var test = - servant->_this (); + test::_narrow (object.in ()); return test._retn (); } @@ -200,8 +211,13 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var safe_servant (servant); ACE_UNUSED_ARG (safe_servant); + PortableServer::ObjectId_var id_act = + root_poa->activate_object (servant); + + CORBA::Object_var object = root_poa->id_to_reference (id_act.in ()); + test_factory_var test_factory = - servant->_this (); + test_factory::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (test_factory.in ()); diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp index 293bb427bb7..c421d2d5f88 100644 --- a/TAO/tests/Xt_Stopwatch/server.cpp +++ b/TAO/tests/Xt_Stopwatch/server.cpp @@ -90,8 +90,13 @@ main (int argc, char *argv[]) Stopwatch_imp server_impl (orb.in (), &timer); + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + Stopwatch_var server = - server_impl._this (); + Stopwatch::_narrow (object.in ()); CORBA::String_var ior = orb->object_to_string (server.in ()); |