2 files changed, 5 insertions, 7 deletions

diff --git a/TAO/tests/Bug_3506_Regression/client.cpp b/TAO/tests/Bug_3506_Regression/client.cpp
index 752efcbfb43..138f8067da0 100644
--- a/TAO/tests/Bug_3506_Regression/client.cpp
+++ b/TAO/tests/Bug_3506_Regression/client.cpp
@@ -92,9 +92,8 @@ public:
                                                ior),
                                               1);
           }
-        ACE_DEBUG ((LM_DEBUG, "RepositoryID: %s\n", obj->_interface_repository_id()))
-        ;
-        client = IF_EXE_M_R::IF_ExeCtrlData::_narrow (obj);
+        ACE_DEBUG ((LM_DEBUG, "RepositoryID: %s\n", obj->_interface_repository_id()));
+        client = IF_EXE_M_R::IF_ExeCtrlData::_narrow (obj.in ());
         if (CORBA::is_nil (client.in ()))
           {
             ACE_ERROR_RETURN ((LM_DEBUG,
diff --git a/TAO/tests/Bug_3506_Regression/server.cpp b/TAO/tests/Bug_3506_Regression/server.cpp
index 802ffe682b4..2267532198a 100644
--- a/TAO/tests/Bug_3506_Regression/server.cpp
+++ b/TAO/tests/Bug_3506_Regression/server.cpp
@@ -92,18 +92,17 @@ Main_C::Create (int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      PortableServer::POA_var poa = PortableServer::POA::_narrow (obj);
+      PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
       mgr->activate ();
 
-      CORBA::Object_var reference;
       IF_Test_impl *servant = new IF_Test_impl;
 
-      reference = poa->servant_to_reference (servant);
+      CORBA::Object_var reference = poa->servant_to_reference (servant);
 
       IF_EXE_M_R::IF_ExeCtrlData_var servant_var =
-        IF_EXE_M_R::IF_ExeCtrlData::_narrow (reference);
+        IF_EXE_M_R::IF_ExeCtrlData::_narrow (reference.in ());
       CORBA::String_var str = m_ORB_p->object_to_string (servant_var);
 
       // Output the IOR to the <ior_output_file>