Moved getTimeout method to IceGrid::Registry interface for consistency with

    Glacier2

1 files changed, 3 insertions, 14 deletions

diff --git a/cpp/src/IceGrid/SessionI.cpp b/cpp/src/IceGrid/SessionI.cpp
index c339d7b9499..0c3b45896a5 100644
--- a/cpp/src/IceGrid/SessionI.cpp
+++ b/cpp/src/IceGrid/SessionI.cpp
@@ -65,11 +65,9 @@ newAllocateObject(const SessionIPtr& session, const IceUtil::Handle<T>& cb)
 
 BaseSessionI::BaseSessionI(const string& id, 
 			   const string& prefix, 
-			   const DatabasePtr& database,
-			   int timeout) :
+			   const DatabasePtr& database) :
     _id(id), 
     _prefix(prefix),
-    _timeout(timeout),
     _traceLevels(database->getTraceLevels()),
     _database(database),
     _destroyed(false),
@@ -106,12 +104,6 @@ BaseSessionI::keepAlive(const Ice::Current& current)
     }
 }
 
-int
-BaseSessionI::getTimeout(const Ice::Current&) const
-{
-    return _timeout;
-}
-
 void
 BaseSessionI::destroy(const Ice::Current& current)
 {
@@ -164,10 +156,9 @@ BaseSessionI::setServantLocator(const SessionServantLocatorIPtr& servantLocator)
 
 SessionI::SessionI(const string& id, 
 		   const DatabasePtr& database, 
-		   int timeout,
 		   const WaitQueuePtr& waitQueue,
 		   const Glacier2::SessionControlPrx& sessionControl) :
-    BaseSessionI(id, "client", database, timeout),
+    BaseSessionI(id, "client", database),
     _waitQueue(waitQueue),
     _sessionControl(sessionControl),
     _allocationTimeout(-1)
@@ -291,11 +282,9 @@ SessionI::removeAllocation(const AllocatablePtr& allocatable)
 
 ClientSessionFactory::ClientSessionFactory(const Ice::ObjectAdapterPtr& adapter,
 					   const DatabasePtr& database, 
-					   int timeout, 
 					   const WaitQueuePtr& waitQueue) :
     _adapter(adapter),
     _database(database), 
-    _timeout(timeout),
     _waitQueue(waitQueue)
 {
 }
@@ -337,7 +326,7 @@ ClientSessionFactory::createGlacier2Session(const string& sessionId, const Glaci
 SessionIPtr
 ClientSessionFactory::createSessionServant(const string& userId, const Glacier2::SessionControlPrx& ctl)
 {
-    return new SessionI(userId, _database, _timeout, _waitQueue, ctl);
+    return new SessionI(userId, _database, _waitQueue, ctl);
 }
 
 const TraceLevelsPtr&