1 files changed, 12 insertions, 10 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
index 087ff256dfa..55757e8c97f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
@@ -28,18 +28,19 @@ Locator_XMLHandler::startElement (const ACEXML_Char*,
       this->server_name_ = ACE_TEXT("");
       this->env_vars_.clear();
 
-      if (attrs != 0 && attrs->getLength () == 8)
+      if (attrs != 0 && attrs->getLength () == 9)
         {
-          this->server_name_ = attrs->getValue ((size_t)0);
-          this->activator_name_ = attrs->getValue ((size_t)1);
-          this->command_line_ = attrs->getValue ((size_t)2);
-          this->working_dir_ = attrs->getValue ((size_t)3);
-          this->activation_ = attrs->getValue ((size_t)4);
+          this->server_id_ = attrs->getValue ((size_t)0);
+          this->server_name_ = attrs->getValue ((size_t)1);
+          this->activator_name_ = attrs->getValue ((size_t)2);
+          this->command_line_ = attrs->getValue ((size_t)3);
+          this->working_dir_ = attrs->getValue ((size_t)4);
+          this->activation_ = attrs->getValue ((size_t)5);
           this->env_vars_.clear ();
-          int limit = ACE_OS::atoi (attrs->getValue ((size_t)5));
+          int limit = ACE_OS::atoi (attrs->getValue ((size_t)6));
           this->start_limit_ = limit;
-          this->partial_ior_ = attrs->getValue ((size_t)6);
-          this->server_object_ior_ = attrs->getValue ((size_t)7);
+          this->partial_ior_ = attrs->getValue ((size_t)7);
+          this->server_object_ior_ = attrs->getValue ((size_t)8);
         }
     }
   else if (ACE_OS::strcasecmp (qName, ACTIVATOR_INFO_TAG) == 0)
@@ -74,7 +75,8 @@ Locator_XMLHandler::endElement (const ACEXML_Char*,
   if (ACE_OS::strcasecmp (qName, SERVER_INFO_TAG) == 0
     && this->server_name_.length () > 0)
   {
-    this->callback_.next_server (this->server_name_,
+    this->callback_.next_server (
+      this->server_id_, this->server_name_,
       this->activator_name_, this->command_line_,
       this->env_vars_, this->working_dir_, this->activation_,
       this->start_limit_, this->partial_ior_, this->server_object_ior_);