diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Freeze/EvictorI.cpp | 9 | ||||
| -rw-r--r-- | cpp/test/Freeze/evictor/config | 8 |
2 files changed, 7 insertions, 10 deletions
diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp index 8d60ac135dc..0840ecab263 100644 --- a/cpp/src/Freeze/EvictorI.cpp +++ b/cpp/src/Freeze/EvictorI.cpp @@ -5,7 +5,7 @@ // Billerica, MA, USA // // All Rights Reserved. -// +//d // Ice is free software; you can redistribute it and/or modify it under // the terms of the GNU General Public License version 2 as published by // the Free Software Foundation. @@ -1121,14 +1121,14 @@ Freeze::EvictorI::deactivate(const string&) Lock sync(*this); if(!_deactivated) - { - saveNowNoSync(); - + { if(_trace >= 1) { Trace out(_communicator->getLogger(), "Freeze.Evictor"); out << "deactivating, saving unsaved Ice objects to the database"; } + + saveNowNoSync(); // // Set the evictor size to zero, meaning that we will evict @@ -1247,6 +1247,7 @@ Freeze::EvictorI::run() } case destroyed: { + facet->status = dead; size_t index = streamedObjectQueue.size(); streamedObjectQueue.resize(index + 1); StreamedObject& obj = streamedObjectQueue[index]; diff --git a/cpp/test/Freeze/evictor/config b/cpp/test/Freeze/evictor/config index cd12aea03c6..1528cdcce53 100644 --- a/cpp/test/Freeze/evictor/config +++ b/cpp/test/Freeze/evictor/config @@ -1,10 +1,6 @@ -# -# Disable automatic saves -# -Freeze.Evictor.db.Test.SaveSizeTrigger=-1 -Freeze.Evictor.db.Test.SavePeriod=0 +Freeze.Evictor.db.Test.SaveSizeTrigger=3 +Freeze.Evictor.db.Test.SavePeriod=2 -#Freeze.Trace.Map=3 #Freeze.Trace.Evictor=3 #Freeze.Trace.DbEnv=3 |