1 files changed, 12 insertions, 5 deletions
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
index 98a931f25e0..aafac254c93 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
@@ -56,8 +56,7 @@ class test_i : public POA_test
 public:
   test_i (ACE_Auto_Event &event);
 
-  void deactivate_self (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void deactivate_self (void);
 
 private:
   ACE_Auto_Event &event_;
@@ -70,7 +69,6 @@ test_i::test_i (ACE_Auto_Event &event)
 
 void
 test_i::deactivate_self (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
@@ -233,9 +231,18 @@ main (int argc, char **argv)
       ACE_Auto_Event event2;
       test_i servant2 (event2);
 
-      test_var test_object1 = servant1._this ();
+      PortableServer::ObjectId_var id_act =
+        root_poa->activate_object (&servant1);
 
-      test_var test_object2 = servant2._this ();
+      CORBA::Object_var object_act = root_poa->id_to_reference (id_act.in ());
+
+      test_var test_object1 = test::_narrow (object_act.in ());
+
+      id_act = root_poa->activate_object (&servant2);
+
+      object_act = root_poa->id_to_reference (id_act.in ());
+
+      test_var test_object2 = test::_narrow (object_act.in ());
 
       PortableServer::ObjectId_var id1 =
         root_poa->reference_to_id (test_object1.in ());