diff options
| author | Anthony Neal <aneal@zeroc.com> | 2002-03-13 20:10:07 +0000 |
|---|---|---|
| committer | Anthony Neal <aneal@zeroc.com> | 2002-03-13 20:10:07 +0000 |
| commit | 27c5fa0a95a523c5bea82eecc420e805b4533aae (patch) | |
| tree | b18f7be9632d266d7e8f6c16b02de831a3e11d57 /cpp/src/Ice/Instance.cpp | |
| parent | cleanup (diff) | |
| download | ice-27c5fa0a95a523c5bea82eecc420e805b4533aae.tar.bz2 ice-27c5fa0a95a523c5bea82eecc420e805b4533aae.tar.xz ice-27c5fa0a95a523c5bea82eecc420e805b4533aae.zip | |
Refactor of SSL Extension, phase 1.
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 02462e9a580..efd8f5bde83 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -22,6 +22,8 @@ #include <Ice/Properties.h> #include <Ice/LoggerI.h> #include <Ice/Network.h> +#include <Ice/SslSystemInternal.h>
+#include <Ice/SslFactory.h>
#ifndef WIN32 # include <Ice/SysLoggerI.h> @@ -114,6 +116,12 @@ IceInternal::Instance::defaultHost() // No mutex lock, immutable. return _defaultHost; } +
+::IceSSL::SystemInternalPtr
+IceInternal::Instance::getSslSystem()
+{
+ return _sslSystem;
+}
RouterManagerPtr IceInternal::Instance::routerManager() @@ -291,7 +299,10 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope _userExceptionFactoryManager = new UserExceptionFactoryManager(); _objectAdapterFactory = new ObjectAdapterFactory(this); _threadPool = new ThreadPool(this); - __setNoDelete(false); + __setNoDelete(false);
+
+ // Get our instance of the SSL System
+ _sslSystem = IceSSL::Factory::getSystem(this); } catch(...) { @@ -417,7 +428,7 @@ IceInternal::Instance::destroy() // synchronization. // threadPool = _threadPool; - _threadPool = 0; + _threadPool = 0; } if (threadPool) |