1 files changed, 5 insertions, 11 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 89c7ccd9cb6..baabda38492 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -662,17 +662,11 @@ IceInternal::Instance::destroy()
 {
     assert(!_destroyed);
 
-    if(_objectAdapterFactory)
-    {
-	_objectAdapterFactory->shutdown();
-	_objectAdapterFactory->waitForShutdown();
-    }
-	
-    if(_outgoingConnectionFactory)
-    {
-	_outgoingConnectionFactory->destroy();
-	_outgoingConnectionFactory->waitUntilFinished();
-    }
+    _objectAdapterFactory->shutdown();	
+    _outgoingConnectionFactory->destroy();
+
+    _objectAdapterFactory->waitForShutdown();
+    _outgoingConnectionFactory->waitUntilFinished();
 
     ThreadPoolPtr serverThreadPool;
     ThreadPoolPtr clientThreadPool;