ChangeLogTag: Wed Mar 14 13:11:52 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

11 files changed, 37 insertions, 65 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c894d617e27..d93186355ed 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Wed Mar 14 13:11:52 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/File_IO/File_i.cpp:
+        * tests/NestedUpcall/Triangle_Test/initiator.cpp:
+        * tests/Nested_Upcall_Crash/Client_Peer.cpp:
+        * tests/Nested_Upcall_Crash/Server_Peer.cpp:
+        * tests/Portable_Interceptors/PICurrent/test_i.cpp:
+
+          Reverted my changes from Tue Mar 13 18:24:27 UTC 2007.  They were
+          not correct.
+
+        * tests/RTCORBA/Dynamic_Thread_Pool/server.cpp:
+        * tests/RTCORBA/Linear_Priority/server.cpp:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp:
+        * tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp:
+        * tests/RTCORBA/Thread_Pool/server.cpp:
+
+          Modified my changes from Tue Mar 13 18:24:27 UTC 2007.  They were
+          also incorrect.
+
 Wed Mar 14 08:12:52 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/DynUnion_Test/DynUnionTest.cpp:
diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp
index 9f8c019e100..39a720c31ee 100644
--- a/TAO/tests/File_IO/File_i.cpp
+++ b/TAO/tests/File_IO/File_i.cpp
@@ -105,12 +105,7 @@ FileImpl::Descriptor::fd (void)
   //
 
   // Get a reference to myself
-  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 ());
+  File::Descriptor_var me = this->_this ();
 
   // Get the ObjectId from the reference
   PortableServer::ObjectId_var oid1 =
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
index 7dbfa16c165..33a1e326958 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
@@ -227,14 +227,7 @@ 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 =
-        Initiator::_narrow (object_act.in ());
+      Initiator_var initiator = this->initiator_i_ptr_->_this ();
 
       this->object_A_var_->foo (initiator.in ());
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
index baa02e4d07a..7cb44068e63 100644
--- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
@@ -35,19 +35,7 @@ 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 =
-      Test::Peer::_narrow (object.in ());
+    Test::Peer_var me = this->_this ();
 
     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 7970d7df3f8..294c3acfa60 100644
--- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp
@@ -48,19 +48,7 @@ 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 =
-      Test::Peer::_narrow (object.in ());
+    Test::Peer_var me = this->_this ();
 
     Test::Payload extra_data(this->payload_size_);
     extra_data.length(this->payload_size_);
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
index 2c3231422ee..0414b720388 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
@@ -42,19 +42,7 @@ 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 =
-    PICurrentTest::test::_narrow (object.in ());
+  PICurrentTest::test_var my_ref = this->_this ();
 
   // ----------------------------------------------------
 
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
index d8f555fc6e1..555caae988f 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
@@ -137,9 +137,9 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   ACE_UNUSED_ARG (safe_servant);
 
   PortableServer::ObjectId_var id =
-    root_poa->activate_object (servant);
+    poa->activate_object (servant);
 
-  CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+  CORBA::Object_var object = poa->id_to_reference (id.in ());
 
   test_var test =
     test::_narrow (object.in ());
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
index 3e125e8728e..e551c2583a5 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
@@ -227,9 +227,9 @@ Task::svc (void)
       PortableServer::ServantBase_var safe_servant (servant);
 
       PortableServer::ObjectId_var id =
-        root_poa->activate_object (servant);
+        poa->activate_object (servant);
 
-      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+      CORBA::Object_var object_act = poa->id_to_reference (id.in ());
 
       test_var test =
         test::_narrow (object_act.in ());
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
index 25b1eb775db..12d4e9b56a7 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
@@ -138,9 +138,9 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   ACE_UNUSED_ARG (safe_servant);
 
   PortableServer::ObjectId_var id =
-    root_poa->activate_object (servant);
+    poa->activate_object (servant);
 
-  CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+  CORBA::Object_var object = poa->id_to_reference (id.in ());
 
   test_var test =
     test::_narrow (object.in ());
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
index 970deecd605..996e7b77a8e 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
@@ -190,9 +190,9 @@ vanilla_poa (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var safe_servant (servant);
 
   PortableServer::ObjectId_var id_act =
-    root_poa->activate_object (servant);
+    poa->activate_object (servant);
 
-  CORBA::Object_var object = root_poa->id_to_reference (id_act.in ());
+  CORBA::Object_var object = poa->id_to_reference (id_act.in ());
 
   test_var test =
     test::_narrow (object.in ());
@@ -274,9 +274,9 @@ rt_poa (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var safe_servant (servant);
 
   PortableServer::ObjectId_var id_act =
-    root_poa->activate_object (servant);
+    poa->activate_object (servant);
 
-  CORBA::Object_var object = root_poa->id_to_reference (id_act.in ());
+  CORBA::Object_var object = poa->id_to_reference (id_act.in ());
 
   test_var test =
     test::_narrow (object.in ());
diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
index b480ef7b4d4..816ea22446e 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
@@ -138,9 +138,9 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   ACE_UNUSED_ARG (safe_servant);
 
   PortableServer::ObjectId_var id =
-    root_poa->activate_object (servant);
+    poa->activate_object (servant);
 
-  CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+  CORBA::Object_var object = poa->id_to_reference (id.in ());
 
   test_var test =
     test::_narrow (object.in ());