Removed Freeze.UseNonmutating

6 files changed, 4 insertions, 10 deletions

diff --git a/cpp/src/Freeze/BackgroundSaveEvictorI.cpp b/cpp/src/Freeze/BackgroundSaveEvictorI.cpp
index 83d4e4e0960..bd4df3dac18 100644
--- a/cpp/src/Freeze/BackgroundSaveEvictorI.cpp
+++ b/cpp/src/Freeze/BackgroundSaveEvictorI.cpp
@@ -756,8 +756,7 @@ Freeze::BackgroundSaveEvictorI::finished(const Current& current, const ObjectPtr
     
         bool enqueue = false;
         
-        if((_useNonmutating && current.mode != Nonmutating) ||
-           (!_useNonmutating && servant->ice_operationAttributes(current.operation) & 0x1) != 0)
+        if((servant->ice_operationAttributes(current.operation) & 0x1) != 0)
         {
             IceUtil::Mutex::Lock lock(element->mutex);
             
diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp
index 7c75bb65d8d..50e718ad3cd 100644
--- a/cpp/src/Freeze/EvictorI.cpp
+++ b/cpp/src/Freeze/EvictorI.cpp
@@ -160,7 +160,6 @@ Freeze::EvictorIBase::EvictorIBase(const ObjectAdapterPtr& adapter,
     _trace = _communicator->getProperties()->getPropertyAsInt("Freeze.Trace.Evictor");
     _txTrace = _communicator->getProperties()->getPropertyAsInt("Freeze.Trace.Transaction");
     _deadlockWarning = (_communicator->getProperties()->getPropertyAsInt("Freeze.Warn.Deadlocks") != 0);
-    _useNonmutating = (_communicator->getProperties()->getPropertyAsInt("Freeze.Evictor.UseNonmutating") != 0);
 }
 
 
diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h
index 03d70f7ccf2..1e653d88607 100644
--- a/cpp/src/Freeze/EvictorI.h
+++ b/cpp/src/Freeze/EvictorI.h
@@ -145,8 +145,6 @@ protected:
 
     bool _deadlockWarning;
 
-    bool _useNonmutating;
-
 private:
 
     Ice::ObjectPtr _pingObject;
diff --git a/cpp/src/Freeze/TransactionalEvictorI.cpp b/cpp/src/Freeze/TransactionalEvictorI.cpp
index f9b0a627e89..8f6e725b493 100644
--- a/cpp/src/Freeze/TransactionalEvictorI.cpp
+++ b/cpp/src/Freeze/TransactionalEvictorI.cpp
@@ -423,8 +423,7 @@ Freeze::TransactionalEvictorI::dispatch(Request& request)
 
     int operationAttributes = sample->ice_operationAttributes(current.operation);
                 
-    bool readOnly = (_useNonmutating && current.mode == Nonmutating) 
-        || (!_useNonmutating && (operationAttributes & 0x1) == 0);
+    bool readOnly = (operationAttributes & 0x1) == 0;
                 
     int txMode = (operationAttributes & 0x6) >> 1;
                 
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index fed60ece5d4..713f3019513 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 //
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon May 11 11:43:17 2009
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri May 15 13:11:40 2009
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -574,7 +574,6 @@ const IceInternal::Property FreezePropsData[] =
     IceInternal::Property("Freeze.Evictor.*.SavePeriod", false, 0),
     IceInternal::Property("Freeze.Evictor.*.SaveSizeTrigger", false, 0),
     IceInternal::Property("Freeze.Evictor.*.StreamTimeout", false, 0),
-    IceInternal::Property("Freeze.Evictor.UseNonmutating", false, 0),
     IceInternal::Property("Freeze.Map.*.BtreeMinKey", false, 0),
     IceInternal::Property("Freeze.Map.*.Checksum", false, 0),
     IceInternal::Property("Freeze.Map.*.PageSize", false, 0),
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 874ddba9496..de482625ce6 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 //
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon May 11 11:43:17 2009
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri May 15 13:11:40 2009
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!