Fixes for bug 3530 & 3536: asserts when thread fails to start

2 files changed, 7 insertions, 1 deletions

diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index c84ff797b7f..23fd5bcb242 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -1495,7 +1495,7 @@ IceInternal::IncomingConnectionFactory::initialize(const string& adapterName)
             {
                 // Here we ignore any exceptions in close().
             }
-            
+            _acceptor = 0;
             throw;
         }
     }
diff --git a/cpp/src/Ice/SelectorThread.cpp b/cpp/src/Ice/SelectorThread.cpp
index c76505c240e..375b7b5a473 100644
--- a/cpp/src/Ice/SelectorThread.cpp
+++ b/cpp/src/Ice/SelectorThread.cpp
@@ -38,11 +38,17 @@ IceInternal::SelectorThread::SelectorThread(const InstancePtr& instance) :
             Error out(_instance->initializationData().logger);
             out << "cannot create thread for selector thread:\n" << ex;
         }
+        _thread = 0;
         __setNoDelete(false);
         throw;
     }
     catch(...)
     {
+        {
+            Error out(_instance->initializationData().logger);
+            out << "cannot create thread for selector thread";
+        }
+        _thread = 0;
         __setNoDelete(false);
         throw;
     }