5 files changed, 30 insertions, 5 deletions
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 ());