Tue May 21 13:22:47 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>

4 files changed, 12 insertions, 104 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 39dad78a33e..8484a0ec656 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Tue May 21 13:22:47 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/ImplRepo_Service/Iterator.h:
+        * orbsvcs/ImplRepo_Service/Iterator.cpp:
+
+          Removed obsolete class.
+
+        * orbsvcs/ImplRepo_Service/LiveCheck.cpp:
+
+          scoreboard cleanup.
+
 Tue May 21 13:17:00 UTC 2013  Simon Massey  <simon dot massey at prismtech dot com>
 
         * orbsvcs/tests/Miop/McastLocal/README:
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
index abe512064a6..ea134b4e623 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
@@ -38,78 +38,3 @@ ImR_AsyncIterator::destroy
   _tao_rh->destroy ();
 }
 
-//----------------------------------------------------------------------------
-ImR_Iterator::ImR_Iterator (CORBA::ULong n,
-                            Locator_Repository& repo,
-                            PortableServer::POA_ptr poa)
-  : repo_(repo)
-  , count_(n)
-  , poa_(poa)
-{
-}
-
-
-CORBA::Boolean
-ImR_Iterator::next_n (CORBA::ULong how_many,
-                      ImplementationRepository::ServerInformationList_out server_list)
-{
-  ACE_NEW_THROW_EX (server_list,
-    ImplementationRepository::ServerInformationList(0), CORBA::NO_MEMORY());
-
-  Locator_Repository::SIMap::ENTRY* entry = 0;
-  Locator_Repository::SIMap::ITERATOR it (this->repo_.servers ());
-
-  // Number of servers that will go into the server_list.
-  CORBA::ULong n = this->repo_.servers().current_size();
-  if (n <= this->count_)
-    {
-      return 0; // We already finished.
-    }
-  else
-    {
-      n -= this->count_;
-    }
-
-  if (how_many > 0 && n > how_many)
-    {
-      n = how_many;
-  }
-
-  server_list->length (n);
-
-  CORBA::ULong i = 0;
-  for (; i < this->count_; ++i)
-    {
-      it.advance ();
-    }
-
-  for (i = 0; i < n; ++i)
-    {
-      it.next (entry);
-      it.advance ();
-      ACE_ASSERT(entry != 0);
-
-      Server_Info_Ptr info = entry->int_id_;
-
-      server_list[i].server = info->name.c_str ();
-      server_list[i].startup.command_line = info->cmdline.c_str ();
-      server_list[i].startup.environment = info->env_vars;
-      server_list[i].startup.working_directory = info->dir.c_str ();
-      server_list[i].startup.activation = info->activation_mode;
-      server_list[i].startup.activator = info->activator.c_str ();
-      server_list[i].startup.start_limit = info->start_limit;
-      server_list[i].partial_ior = info->partial_ior.c_str ();
-    }
-
-  this->count_ += n;
-
-  return 1;
-}
-
-
-void
-ImR_Iterator::destroy (void)
-{
-  PortableServer::ObjectId_var oid = poa_->servant_to_id (this);
-  poa_->deactivate_object (oid.in());
-}
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
index ff74eaee1ad..e5f1c78eac5 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
@@ -44,33 +44,4 @@ private:
   AsyncListManager_ptr lister_;
 };
 
-/**
- * @class ImR_Iterator
- *
- * @brief The Iterator for servers in the ImR.
- *
- */
-class ImR_Iterator
-  : public POA_ImplementationRepository::ServerInformationIterator
-{
-public:
-  ImR_Iterator (CORBA::ULong start,
-                Locator_Repository& repo,
-                PortableServer::POA_ptr poa);
-
-  /// Returns the next list of up to <how_many> servers.  If empty, will return
-  /// false.
-  virtual CORBA::Boolean next_n (
-      CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list
-    );
-
-  virtual void destroy (void);
-
-private:
-  Locator_Repository& repo_;
-  CORBA::ULong count_;
-  PortableServer::POA_ptr poa_;
-};
-
 #endif /* IMR_ITERATOR_H */
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
index 99dfdd7f6f9..e93571dcb0d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
@@ -75,6 +75,7 @@ LiveEntry::status_name (LiveStatus s)
     case LS_TIMEDOUT:
       return ACE_TEXT ("TIMEDOUT");
     }
+  return ACE_TEXT ("<undefined status>");
 }
 
 void