Fixed bug with finishSetup.

1 files changed, 11 insertions, 6 deletions

diff --git a/cppe/src/IceE/Communicator.cpp b/cppe/src/IceE/Communicator.cpp
index 6101ab82c61..cb5a33698b0 100755
--- a/cppe/src/IceE/Communicator.cpp
+++ b/cppe/src/IceE/Communicator.cpp
@@ -137,10 +137,7 @@ Ice::Communicator::createObjectAdapter(const string& name)
 	throw CommunicatorDestroyedException(__FILE__, __LINE__);
     }
     
-    assert(_instance);
-    ObjectAdapterPtr adapter = _instance->objectAdapterFactory()->createObjectAdapter(name);
-
-    return adapter;
+    return _instance->objectAdapterFactory()->createObjectAdapter(name);
 }
 
 ObjectAdapterPtr
@@ -309,6 +306,14 @@ Ice::Communicator::~Communicator()
 void
 Ice::Communicator::finishSetup(int& argc, char* argv[])
 {
-    _instance->finishSetup(argc, argv);
+    try
+    {
+	_instance->finishSetup(argc, argv);
+    }
+    catch(...)
+    {
+	_destroyed = true;
+	_instance->destroy();
+	throw;
+    }
 }
-