Fri Dec 6 16:50:00 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>

        * orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
        * orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp:
          Make these resolve the same version of the IORTable service as
          the locator main to ensure proper cleanup.

        * tao/IORTable/Table_Adapter.cpp:
          Force cleanup of the implementation instance on cleanup.

        * tao/ORB_Core.h:
        * tao/ORB_Core.inl:
        * tao/ORB_Core.cpp:
          Covert the base reference to the IORTable instance to a var
          type so that references are released on ORB shutdown. Valgrind
          revealed that the IORTable implementation objects were being
          lost due to refcount never reaching 0. There are many Object_ptr
          members of the ORB Core that may need to be converted to vars
          for the same reason.

        * orbsvcs/tests/ImplRepo/kill_server/Test.idl:
        * orbsvcs/tests/ImplRepo/kill_server/Test_i.h:
        * orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp:
        * orbsvcs/tests/ImplRepo/kill_server/client.cpp:
        * orbsvcs/tests/ImplRepo/kill_server/run_test.pl:
          Make the test capable of building on CORBA/e builds.

5 files changed, 7 insertions, 70 deletions

diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test.idl b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test.idl
index feaa629b0fa..db920a2d270 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test.idl
@@ -3,9 +3,6 @@
 interface Test
 {
 
-  // Return the number of the server after a delay
   short get_server_num ();
 
-  void pause (in char poa_id);
-  void resume (in char poa_id);
 };
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp
index cd7df0953d1..8e068fd14cb 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp
@@ -31,43 +31,5 @@ Test_i::get_server_num (void)
   return this->server_num_;
 }
 
-void
-Test_i::pause (CORBA::Char poa_id)
-{
-  if (poa_id == 'a')
-    {
-      this->reset (this->mgr_a, true);
-    }
-  else if (poa_id == 'b')
-    {
-      this->reset (this->mgr_b, true);
-    }
-}
-
-void
-Test_i::resume (CORBA::Char poa_id)
-{
-  if (poa_id == 'a')
-    {
-      this->reset (this->mgr_a, false);
-    }
-  else if (poa_id == 'b')
-    {
-      this->reset (this->mgr_b, false);
-    }
-}
-
-void
-Test_i::reset (PortableServer::POAManager_var &mgr, bool pause)
-{
-  if (pause)
-    {
-      mgr->hold_requests (false);
-    }
-  else
-    {
-      mgr->activate ();
-    }
-}
 
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h
index 6053300275d..08b4d5ad8a3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h
@@ -25,9 +25,6 @@ public:
 
   virtual CORBA::Short get_server_num (void);
 
-  virtual void pause (CORBA::Char poa_id);
-  virtual void resume (CORBA::Char poa_id);
-
 private:
   void reset (PortableServer::POAManager_var &mgr, bool pause);
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp
index c0abbab52c8..75e21212960 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp
@@ -11,20 +11,12 @@ char resume_poa = ' ';
 int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("p:r:"));
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT(""));
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
       {
-      case 'p':
-        pause_poa = *get_opts.opt_arg ();
-        break;
-
-      case 'r':
-        resume_poa = *get_opts.opt_arg ();
-        break;
-
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -52,21 +44,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     Test_var test = Test::_narrow( obj.in() );
     ACE_ASSERT (!CORBA::is_nil(test.in()));
 
-    if (pause_poa != ' ')
-      {
-        test->pause (pause_poa);
-      }
-    if (resume_poa != ' ')
-      {
-        test->resume (resume_poa);
-      }
-    if (pause_poa == ' ' && resume_poa == ' ')
-      {
-        CORBA::Short n = test->get_server_num ();
-        ACE_DEBUG ((LM_DEBUG,
-                    "Client received reply from server %d\n",
-                    n));
-      }
+    CORBA::Short n = test->get_server_num ();
+    ACE_DEBUG ((LM_DEBUG,
+                "Client received reply from server %d\n",
+                n));
 
     return 0;
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl
index d9cfcd6327a..19023449c8e 100755
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl
@@ -54,7 +54,7 @@ for(my $i = 0; $i < $servers_count; $i++) {
 }
 
 my $refstyle = " -ORBobjrefstyle URL";
-my $obj_count = 1;
+my $obj_count = 2;
 my $port = 9876;
 
 my $objprefix = "TestObject";
@@ -236,7 +236,7 @@ sub list_active_servers($)
 
 sub servers_list_test
 {
-    print "Running scale test with $servers_count servers and $obj_count objects.\n";
+    print "Running server kill test with $servers_count servers and $obj_count objects.\n";
 
     my $result = 0;
     my $start_time = time();