diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-08-30 16:15:46 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-08-30 16:15:46 +0200 |
| commit | 90679336bd9c0abddfdcfc037b58a3fbe8299fbf (patch) | |
| tree | 578692481f64bf0f1b1d76351b395dfbcf52a708 /cpp/src/IceGrid/SessionI.cpp | |
| parent | bug 2424: check for null in Java hashCode method (diff) | |
| download | ice-90679336bd9c0abddfdcfc037b58a3fbe8299fbf.tar.bz2 ice-90679336bd9c0abddfdcfc037b58a3fbe8299fbf.tar.xz ice-90679336bd9c0abddfdcfc037b58a3fbe8299fbf.zip | |
Squashed commit of the following:
commit a61fce80c95ed97d9716648c2083c8581326e950
Author: Benoit Foucher <benoit@zeroc.com>
Date: Thu Aug 30 15:33:54 2007 +0200
Added optimization to not wakeup too often
commit d44134e724e43aeb1db8693a37a5b611f295948c
Author: Benoit Foucher <benoit@zeroc.com>
Date: Thu Aug 30 11:34:22 2007 +0200
Changed the connection monitor to use the timer.
commit 915f0669599a457f46974c3a108205d5c3c666ba
Author: Benoit Foucher <benoit@zeroc.com>
Date: Wed Aug 29 16:18:59 2007 +0200
Fixed IceGrid and casino demo to use IceUtil::Timer
Diffstat (limited to 'cpp/src/IceGrid/SessionI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/SessionI.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/IceGrid/SessionI.cpp b/cpp/src/IceGrid/SessionI.cpp index 263331bae3e..694ed50bff5 100644 --- a/cpp/src/IceGrid/SessionI.cpp +++ b/cpp/src/IceGrid/SessionI.cpp @@ -184,10 +184,10 @@ BaseSessionI::registerWithObjectAdapter(const Ice::ObjectAdapterPtr& adapter) SessionI::SessionI(const string& id, const DatabasePtr& database, bool filters, - const WaitQueuePtr& waitQueue, + const IceUtil::TimerPtr& timer, const Glacier2::SessionControlPrx& sessionControl) : BaseSessionI(id, "client", database, filters), - _waitQueue(waitQueue), + _timer(timer), _sessionControl(sessionControl), _allocationTimeout(-1) { @@ -316,11 +316,11 @@ SessionI::destroyImpl(bool shutdown) ClientSessionFactory::ClientSessionFactory(const Ice::ObjectAdapterPtr& adapter, const DatabasePtr& database, - const WaitQueuePtr& waitQueue, + const IceUtil::TimerPtr& timer, const ReapThreadPtr& reaper) : _adapter(adapter), _database(database), - _waitQueue(waitQueue), + _timer(timer), _reaper(reaper), _filters(false) { @@ -376,7 +376,7 @@ ClientSessionFactory::createGlacier2Session(const string& sessionId, const Glaci SessionIPtr ClientSessionFactory::createSessionServant(const string& userId, const Glacier2::SessionControlPrx& ctl) { - return new SessionI(userId, _database, _filters, _waitQueue, ctl); + return new SessionI(userId, _database, _filters, _timer, ctl); } const TraceLevelsPtr& |