diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/EvictorI.cpp | 24 | ||||
| -rw-r--r-- | cpp/src/Freeze/EvictorI.h | 1 |
2 files changed, 5 insertions, 20 deletions
diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp index 4ed65ed4863..8d60ac135dc 100644 --- a/cpp/src/Freeze/EvictorI.cpp +++ b/cpp/src/Freeze/EvictorI.cpp @@ -241,7 +241,6 @@ Freeze::EvictorI::EvictorI(const CommunicatorPtr communicator, _dbEnv(0), _dbEnvHolder(SharedDbEnv::get(communicator, envName)), _trace(0), - _noSyncAllowed(false), _generation(0) { _dbEnv = _dbEnvHolder.get(); @@ -258,7 +257,6 @@ Freeze::EvictorI::EvictorI(const CommunicatorPtr communicator, _communicator(communicator), _dbEnv(&dbEnv), _trace(0), - _noSyncAllowed(false), _generation(0) { init(envName, dbName, createDb); @@ -268,8 +266,7 @@ void Freeze::EvictorI::init(const string& envName, const string& dbName, bool createDb) { _trace = _communicator->getProperties()->getPropertyAsInt("Freeze.Trace.Evictor"); - _noSyncAllowed = (_communicator->getProperties()->getPropertyAsInt("Freeze.Evictor.NoSyncAllowed") != 0); - + string propertyPrefix = string("Freeze.Evictor.") + envName + '.' + dbName; // @@ -1327,21 +1324,10 @@ Freeze::EvictorI::run() } else { - if(_noSyncAllowed) - { - facet->status = clean; - size_t index = streamedObjectQueue.size(); - streamedObjectQueue.resize(index + 1); - StreamedObject& obj = streamedObjectQueue[index]; - streamFacet(facet, allObjects[i]->first, status, saveStart, obj); - } - else - { - DatabaseException ex(__FILE__, __LINE__); - ex.message = string(typeid(*facet->rec.servant).name()) - + " does not implement IceUtil::AbstractMutex and Freeze.Evictor.NoSyncAllowed is 0"; - throw ex; - } + DatabaseException ex(__FILE__, __LINE__); + ex.message = string(typeid(*facet->rec.servant).name()) + + " does not implement IceUtil::AbstractMutex"; + throw ex; } } } while(tryAgain); diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h index c5f0c3188fa..d8107e0d910 100644 --- a/cpp/src/Freeze/EvictorI.h +++ b/cpp/src/Freeze/EvictorI.h @@ -225,7 +225,6 @@ private: std::auto_ptr<Db> _db; ServantInitializerPtr _initializer; Ice::Int _trace; - bool _noSyncAllowed; // // Threads that have requested a "saveNow" and are waiting for |