5 files changed, 8 insertions, 1 deletions
diff --git a/cpp/src/Freeze/BackgroundSaveEvictorI.cpp b/cpp/src/Freeze/BackgroundSaveEvictorI.cpp
index b4b318b2ce6..db422db3415 100644
--- a/cpp/src/Freeze/BackgroundSaveEvictorI.cpp
+++ b/cpp/src/Freeze/BackgroundSaveEvictorI.cpp
@@ -198,7 +198,9 @@ Freeze::BackgroundSaveEvictorI::BackgroundSaveEvictorI(const ObjectAdapterPtr& a
     //
     // Start saving thread
     //
+    __setNoDelete(true);
     start();
+    __setNoDelete(false);
 }
 
 
diff --git a/cpp/src/Freeze/SharedDbEnv.cpp b/cpp/src/Freeze/SharedDbEnv.cpp
index 620a17459b9..1455d9aa613 100644
--- a/cpp/src/Freeze/SharedDbEnv.cpp
+++ b/cpp/src/Freeze/SharedDbEnv.cpp
@@ -604,7 +604,9 @@ Freeze::CheckpointThread::CheckpointThread(SharedDbEnv& dbEnv, const Time& check
     _kbyte(kbyte),
     _trace(trace)
 {
+    __setNoDelete(true);
     start();
+    __setNoDelete(false);
 }
 
 void
diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp
index a9e3832de70..455131d169b 100644
--- a/cpp/src/Ice/EndpointI.cpp
+++ b/cpp/src/Ice/EndpointI.cpp
@@ -33,7 +33,9 @@ IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& insta
     _instance(instance),
     _destroyed(false)
 {
+    __setNoDelete(false);
     start();
+    __setNoDelete(true);
 }
 
 void
diff --git a/cpp/src/Ice/SelectorThread.cpp b/cpp/src/Ice/SelectorThread.cpp
index 375b7b5a473..4b45bff6c03 100644
--- a/cpp/src/Ice/SelectorThread.cpp
+++ b/cpp/src/Ice/SelectorThread.cpp
@@ -25,7 +25,6 @@ IceInternal::SelectorThread::SelectorThread(const InstancePtr& instance) :
     _selector(instance),
     _timer(_instance->timer())
 {
-
     __setNoDelete(true);
     try
     {
diff --git a/cpp/src/IceUtil/Timer.cpp b/cpp/src/IceUtil/Timer.cpp
index a5b2175c425..c76ea8245e8 100644
--- a/cpp/src/IceUtil/Timer.cpp
+++ b/cpp/src/IceUtil/Timer.cpp
@@ -15,7 +15,9 @@ using namespace IceUtil;
 
 Timer::Timer() : _destroyed(false)
 {
+    __setNoDelete(false);
     start();
+    __setNoDelete(true);
 }
 
 void