diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-01-14 18:43:01 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-01-14 18:43:01 +0000 |
| commit | f453785066eff4e8d9f5c7fd63bd01b4260020ed (patch) | |
| tree | 1410e9fc19a52042879f9f06fe9e6c1ecb443e2a /cpp/src/Ice/CommunicatorI.cpp | |
| parent | file ServerBlobject.cpp was initially added on branch glacier. (diff) | |
| download | ice-f453785066eff4e8d9f5c7fd63bd01b4260020ed.tar.bz2 ice-f453785066eff4e8d9f5c7fd63bd01b4260020ed.tar.xz ice-f453785066eff4e8d9f5c7fd63bd01b4260020ed.zip | |
glacier intergration
Diffstat (limited to 'cpp/src/Ice/CommunicatorI.cpp')
| -rw-r--r-- | cpp/src/Ice/CommunicatorI.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp index 89f729280d6..3739182bcdf 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -11,6 +11,7 @@ #include <Ice/CommunicatorI.h> #include <Ice/Instance.h> #include <Ice/Properties.h> +#include <Ice/ReferenceFactory.h> #include <Ice/ProxyFactory.h> #include <Ice/ThreadPool.h> #include <Ice/ObjectFactoryManager.h> @@ -31,6 +32,7 @@ Ice::CommunicatorI::destroy() if (_instance) { + _instance->objectAdapterFactory()->shutdown(); _instance->destroy(); _instance = 0; } @@ -80,7 +82,13 @@ Ice::CommunicatorI::proxyToString(const ObjectPrx& proxy) ObjectAdapterPtr Ice::CommunicatorI::createObjectAdapter(const string& name) { - return createObjectAdapterFromProperty(name, "Ice.Adapter." + name + ".Endpoints"); + ObjectAdapterPtr adapter = createObjectAdapterFromProperty(name, "Ice.Adapter." + name + ".Endpoints"); + string router = _instance->properties()->getProperty("Ice.Adapter." + name + ".Router"); + if (!router.empty()) + { + adapter->addRouter(RouterPrx::uncheckedCast(_instance->proxyFactory()->stringToProxy(router))); + } + return adapter; } ObjectAdapterPtr @@ -205,6 +213,12 @@ Ice::CommunicatorI::setLogger(const LoggerPtr& logger) _instance->logger(logger); } +void +Ice::CommunicatorI::setDefaultRouter(const RouterPrx& router) +{ + _instance->referenceFactory()->setDefaultRouter(router); +} + StreamPtr Ice::CommunicatorI::createStream() { |