diff options
| author | Bernard Normier <bernard@zeroc.com> | 2004-04-26 20:29:21 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2004-04-26 20:29:21 +0000 |
| commit | c1bced4dc023a43e589427477abf2a816e6c26f7 (patch) | |
| tree | f93a6a2f77f56fe35ee07291643d23e3ccc500c8 /cpp/src/Freeze/EvictorI.cpp | |
| parent | Added Freeze evictor safe-deactivation and more tests (diff) | |
| download | ice-c1bced4dc023a43e589427477abf2a816e6c26f7.tar.bz2 ice-c1bced4dc023a43e589427477abf2a816e6c26f7.tar.xz ice-c1bced4dc023a43e589427477abf2a816e6c26f7.zip | |
Minor fixes
Diffstat (limited to 'cpp/src/Freeze/EvictorI.cpp')
| -rw-r--r-- | cpp/src/Freeze/EvictorI.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp index d734b66665a..f7b988f8f36 100644 --- a/cpp/src/Freeze/EvictorI.cpp +++ b/cpp/src/Freeze/EvictorI.cpp @@ -383,7 +383,6 @@ Freeze::EvictorI::setSize(Int evictorSize) Int Freeze::EvictorI::getSize() { - DeactivateController::Guard deactivateGuard(_deactivateController); Lock sync(*this); return static_cast<Int>(_evictorSize); } @@ -993,6 +992,11 @@ Freeze::EvictorI::hasFacet(const Identity& ident, const string& facet) ObjectPtr Freeze::EvictorI::locate(const Current& current, LocalObjectPtr& cookie) { + // + // If only Ice calls locate/finished/deactivate, then it cannot be deactivated. + // + DeactivateController::Guard deactivateGuard(_deactivateController); + ObjectPtr result = locateImpl(current, cookie); if(result == 0) @@ -1051,11 +1055,6 @@ Freeze::EvictorI::locate(const Current& current, LocalObjectPtr& cookie) ObjectPtr Freeze::EvictorI::locateImpl(const Current& current, LocalObjectPtr& cookie) { - // - // If only Ice calls locate/finished/deactivate, then it cannot be deactivated. - // - DeactivateController::Guard deactivateGuard(_deactivateController); - cookie = 0; ObjectStore* store = findStore(current.facet); |