Improved IceGrid discovery, it now works with icegrid registry slaves and nodes

1 files changed, 19 insertions, 17 deletions

diff --git a/cpp/src/IceGrid/SessionManager.h b/cpp/src/IceGrid/SessionManager.h
index e1d3d6e90de..2ff28178032 100644
--- a/cpp/src/IceGrid/SessionManager.h
+++ b/cpp/src/IceGrid/SessionManager.h
@@ -192,8 +192,8 @@ public:
         return _state != Destroyed;
     }
 
-    virtual void
-    tryCreateSession(bool waitForTry = true, const IceUtil::Time& timeout = IceUtil::Time())
+    void
+    tryCreateSession()
     {
         {
             Lock sync(*this);
@@ -212,23 +212,24 @@ public:
             }
             notifyAll();
         }
+    }
 
-        if(waitForTry)
+    void
+    waitTryCreateSession(const IceUtil::Time& timeout = IceUtil::Time())
+    {
+        Lock sync(*this);
+        // Wait until the action is executed and the state changes.
+        while(_nextAction == Connect || _nextAction == KeepAlive || _state == InProgress)
         {
-            Lock sync(*this);
-            // Wait until the action is executed and the state changes.
-            while(_nextAction == Connect || _nextAction == KeepAlive || _state == InProgress)
+            if(timeout == IceUtil::Time())
             {
-                if(timeout == IceUtil::Time())
-                {
-                    wait();
-                }
-                else
+                wait();
+            }
+            else
+            {
+                if(!timedWait(timeout))
                 {
-                    if(!timedWait(timeout))
-                    {
-                        break;
-                    }
+                    break;
                 }
             }
         }
@@ -320,16 +321,17 @@ class SessionManager : public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
-    SessionManager(const Ice::CommunicatorPtr&);
+    SessionManager(const Ice::CommunicatorPtr&, const std::string&);
     virtual ~SessionManager();
 
     virtual bool isDestroyed() = 0;
 
 protected:
 
-    std::vector<IceGrid::QueryPrx> findAllQueryObjects();
+    std::vector<IceGrid::QueryPrx> findAllQueryObjects(bool);
 
     Ice::CommunicatorPtr _communicator;
+    std::string _instanceName;
     InternalRegistryPrx _master;
     std::vector<IceGrid::QueryPrx> _queryObjects;
 };