ChangeLogTag: Tue Mar 13 18:24:27 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

5 files changed, 34 insertions, 5 deletions

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,