Mon May 13 21:38:06 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
index 7a16a42750f..047c05fb53e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
@@ -145,6 +145,7 @@ AsyncListManager::list_i (CORBA::ULong start, CORBA::ULong how_many)
       it.advance ();
     }
   this->server_list_.length (len);
+  this->waiters_ = 0;
   for (CORBA::ULong i = 0; i < len; i++)
     {
       it.next (entry);
@@ -175,16 +176,16 @@ AsyncListManager::list_i (CORBA::ULong start, CORBA::ULong how_many)
               this->server_list_[i].activeStatus =
                 ImplementationRepository::ACTIVE_NO;
             }
+          else
+            {
+              this->waiters_++;
+            }
         }
     }
-  if (len == 0 || this->pinger_ == 0)
+  if (this->waiters_ == 0)
     {
       this->final_state ();
     }
-  else
-    {
-      this->waiters_ = len;
-    }
 }