diff options
| author | Michi Henning <michi@zeroc.com> | 2003-05-08 05:46:29 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2003-05-08 05:46:29 +0000 |
| commit | 225855fb6b992a4207f9107d988036aa1ee0d217 (patch) | |
| tree | efa68b5ed0afbc0753e7b8d98786674262caa872 /cpp/src/Ice/Instance.cpp | |
| parent | more install projects (diff) | |
| download | ice-225855fb6b992a4207f9107d988036aa1ee0d217.tar.bz2 ice-225855fb6b992a4207f9107d988036aa1ee0d217.tar.xz ice-225855fb6b992a4207f9107d988036aa1ee0d217.zip | |
Merged HEAD and slicing trees.
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 9ad9cff4fde..53553bd4069 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -23,7 +23,6 @@ #include <Ice/ConnectionFactory.h> #include <Ice/ConnectionMonitor.h> #include <Ice/ObjectFactoryManager.h> -#include <Ice/UserExceptionFactoryManager.h> #include <Ice/LocalException.h> #include <Ice/ObjectAdapterFactory.h> #include <Ice/Exception.h> @@ -249,19 +248,6 @@ IceInternal::Instance::servantFactoryManager() return _servantFactoryManager; } -UserExceptionFactoryManagerPtr -IceInternal::Instance::userExceptionFactoryManager() -{ - IceUtil::RecMutex::Lock sync(*this); - - if(_destroyed) - { - throw CommunicatorDestroyedException(__FILE__, __LINE__); - } - - return _userExceptionFactoryManager; -} - ObjectAdapterFactoryPtr IceInternal::Instance::objectAdapterFactory() { @@ -497,8 +483,6 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, int& argc, _servantFactoryManager = new ObjectFactoryManager(); - _userExceptionFactoryManager = new UserExceptionFactoryManager(); - _objectAdapterFactory = new ObjectAdapterFactory(this, communicator); __setNoDelete(false); @@ -520,7 +504,6 @@ IceInternal::Instance::~Instance() assert(!_outgoingConnectionFactory); assert(!_connectionMonitor); assert(!_servantFactoryManager); - assert(!_userExceptionFactoryManager); assert(!_objectAdapterFactory); assert(!_clientThreadPool); assert(!_serverThreadPool); @@ -693,9 +676,6 @@ IceInternal::Instance::destroy() _servantFactoryManager->destroy(); _servantFactoryManager = 0; - _userExceptionFactoryManager->destroy(); - _userExceptionFactoryManager = 0; - _referenceFactory->destroy(); _referenceFactory = 0; |