summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/ReplicaSessionManager.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2006-12-04 19:43:10 +0000
committerBenoit Foucher <benoit@zeroc.com>2006-12-04 19:43:10 +0000
commit996be326b98f2c5bb776ba68dd2b3d8b2861a12a (patch)
tree446bb318a97f7e64b35f299407f03868942c7c0f /cpp/src/IceGrid/ReplicaSessionManager.cpp
parentRemoved -single_module, it doesn't seem to be neccessary anymore (diff)
downloadice-996be326b98f2c5bb776ba68dd2b3d8b2861a12a.tar.bz2
ice-996be326b98f2c5bb776ba68dd2b3d8b2861a12a.tar.xz
ice-996be326b98f2c5bb776ba68dd2b3d8b2861a12a.zip
More cleanup
Diffstat (limited to 'cpp/src/IceGrid/ReplicaSessionManager.cpp')
-rw-r--r--cpp/src/IceGrid/ReplicaSessionManager.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/ReplicaSessionManager.cpp b/cpp/src/IceGrid/ReplicaSessionManager.cpp
index 31802da355c..fa99a035092 100644
--- a/cpp/src/IceGrid/ReplicaSessionManager.cpp
+++ b/cpp/src/IceGrid/ReplicaSessionManager.cpp
@@ -333,9 +333,10 @@ ReplicaSessionManager::create(const InternalRegistryPrx& replica)
NodePrxSeq
ReplicaSessionManager::getNodes(const NodePrxSeq& nodes) const
{
+ assert(_thread && _thread->getRegistry());
try
{
- return _master->getNodes();
+ return _thread->getRegistry()->getNodes();
}
catch(const Ice::LocalException&)
{
@@ -526,7 +527,7 @@ ReplicaSessionManager::createSessionImpl(const InternalRegistryPrx& registry, Ic
{
try
{
- ReplicaSessionPrx session = registry->registerReplica(_name, _info, _internalRegistry);
+ ReplicaSessionPrx session = registry->registerReplica(_info, _internalRegistry);
int t = session->getTimeout();
if(t > 0)
{