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

2 files changed, 12 insertions, 2 deletions

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 ());